updates for OSX support