Minor database tidy-up