Re: Improve Cygwin compatibility