random fixes on windows