DB/SAI: Some EAI to SAI conversions.