Small fixes to MSVC building