Windows compatibility fixes
4 files changed