Some build fixes to support compilation with MSVC on Windows
2 files changed