Minor changes for latest version of Xcode.