Merging some more cygwin/mac differences