Apply Xcode 6.1 changes