More context fixes