Get things working on OS X