Partial iOS 8 fix.