Still fixing iOS 6 issues