Fixes issues with MS Windows OS