Initial Yosemite support (part 1)