fixes to remove warnings for iOS 6+