- Some changes for iOS 7 compatibility