More fixes for Cygwin