Basic fixes for Windows #354