Initial Yosemite support (part 3)