[PATCH 21.4] Misc. cygwin fixes