Update for OSX support