Fix merged changes from Cygwin