iOS 7 deprecation related fixes