Fixes for building with MSVC.
4 files changed