Changes to work on windows