Some more MSVC fixes