Fix up context