Improve context info.