Made a couple of minor changes to DB for consistency