Skip to content

More fixes

More fixes #1788