(MSVC) Some MSVC build fixes