Skip to content

Fixes from code review #347

Fixes from code review

Fixes from code review #347