fix some issues introduced by MSVC port
2 files changed