... and fix cygwin build