Fixing some Windows problems (#717)

8 files changed