Handling some issues in enrichment data generation (closes #76)