Merging some cygwin/mac differences