Some Minor changes to work on windows