msvc fix up