DB/Misc: Fix some startup errors.
Merge remote-tracking branch 'official/master'