Windows fix

Some fixes for Windows OS.
Will be fixed as you like!