More improvements for cygwin building