Builds on Windows again