Fixed issues related to iOS 8