Add missing reference in Mac Setup, fix tabs
Merge branch 'mac-x' into unified