Skip to content

More fixups

More fixups #1450