DB/SAI: more EAI to SAI updates.