Match osx changes