Hacks to get everything to work on Mac