more MSVC fixes