Yosemite related changes