Fix issues with iOS 8