Bug fixes on windows for buggy 17.1