Update to run on Mac OSX