MSVC build fixes
3 files changed