Skip to content

Msvc fixes

Msvc fixes #1727