Update for Xcode 6