Fix iOS 7.1 issues