Fixes some MSVC warnings
6 files changed