extracted mac-osx fixes into their own repo and added as a submodule to this one