DB/Misc: Misc fixes