msvc fixes
2 files changed