dbm: Fix known bugs