Tweaks for osx -- testing 2