OS X: add a bunch of tweaks back