More changes for Xcode 6.1