fix issues on windows