Minor fixes to get current with the iOS 3.0 SDK