DB/Misc: Couple more fixes

closes #13112
closes #13115