MSVC fixup