Preliminary support for OSX