Builds on windows again