Update for xcode 6