Fixing issues on iOS 7 (finally)