Skip to content

Fixes from audit

Fixes from audit #90