Windows fix

Some fixes for Windows OS.