misc changes for Windows
misc fixes for Windows