Macos/cygwin compatability updates