Skip to content

Misc fixes

Misc fixes #2331