Fix issues on windows