Enrichment fixes