DB/SAI: Fix more credit fixes

By Pitcrawler, closes #10022