More changes to compile on Windows/Cygwin