More context improvements.