Minor updates to make cygwin work better