Another try to get this to build on Windows