DB/Update: Few updates

Fixes #10758