Skip to content

Type fixes

Type fixes #1220