Fix sub-context lookups