Skip to content

some fixes

some fixes #10676