Update the code to support Xcode 6.1