windows fixes to build with OSGeo4W64