Repairing iOS 8 changes 2