2 changes for iOS 6 compilation.