Initial Yosemite support (part 2)