.osx: Updates from upstream