(cherry picked from commit 2b3d72d1baa77630603205392ea221f24a2cbedd) DB/Misc: Fix startup errors (cherry picked from commit d76f077a7f9e6a17e9bb28a7ebefb048fccca343) DB/Misc: Fix startup errors (cherry picked from commit 2151d5f4204360bac612600215e20a81980ea17e)