db: some small fixes after /usr merge work
Some of these come after the discussion in the moving things MR, as they would have made it a lot more clear to understand what was required, and what not
Some of these come after the discussion in the moving things MR, as they would have made it a lot more clear to understand what was required, and what not