Fixing some iOS 7 issues