Fixes for MSVC builds.