(MSVC) Some more MSVC fixes