DB/EAI: Fix unit_field changes, outdated since initial 3.x versions