More iOS 8 fixes