Tweaked setup for Yosemite