tweaks for MSVC compile, ran win32 tests