More fixes for iOS 7 & 8 compatability.