Some minor context fixup