Various tweaks for osx