Msvc build fixes