MSVC changes