[dev-context] enco-uc fixes