Fixing iOS 7 bugs