Update for Xcode 6.1.1 changes