Update to build on OSX again