DB/SAI: More EAI to SAI conversions