Tweaks for mac added to master