tweaks for msvc