Fixed some iOS 8 issues