Repairing iOS 8 changes 3