tweaks for MSVC