Better support for MSVC
3 files changed