DB/SAI: Fix more credit fixes

By dr-j, closes #10872