DB SAI/EAI: Fix some errors introduced from the EAI to SAI conversions.