Fixed a few bugs in the MSVC toolchain.