Better OSX support