Further minor changes to ensure compatibility between Mavericks and Yosemite.