Bring in several forgotten MSVC fixes.
7 files changed