Yosemite fixes