Update the code for Xcode 6 GM