Some corrections for Windows

Can you add these corrections to the master branch.

Thank you