.osx: Various upstream updates