Update for Yosemite compatibility