Some MSVC fixes