Some fixes for Windows OS