Repairing iOS 8 changes...