iOS 8 fixes