Some fixes for Windows OS

Windows fixes.