Yosemites fixes