Fixes for Windows OS