Skip to content

Follow-up fixes

Follow-up fixes #83