Changes to MSVC++