More fixes for MSVC builds.