DB/SAI: Fix more some db errors