Updated to work with the latest Yosemite beta