* More Yosemite fixes