Working on OSX support