Some updates before the Yosemite upgrade