DB/EAI: Some updates from acid to add to EAI before final convertion.