more msvc fixes