fixes on windows