more fixes for enrichment.