Windows port compiles again