Tweaks for osx -- testing