Even more MSVC build fixes