DB/SAI: Misc Fixes 

Authors @untaught @dr-j @MitchesD
Fixes #10847 Fixes #10844 Fixes #10830 Fixes #10829 Fixes #10830