Update for Cygwin. And fix.