Fixed iOS 8.0 issues