Added cygwin fixes