(MSVC) More MSVC C++ fixes