DB/SAI: Misc Fixes from IT

By @dr-j and @untaught
Fixes #11081 fixes #11080 fixes #11082