Updates based on Yosemite insatll