Work towards support for OSX