WIP: Better OSX support