Some changes to make it work with Yosemite