Apply Xcode 6 changes