DB/SAI: Fix more runtime errors

By dr-j