A few changes to support OS X Yosemite