Minor fixes for cygwin.