fixes for msvc
2 files changed