Finish backport work on OSX