DB/SAI: Fix a couple errors. Closes #8839