Fixes for new cygwin