Fixing up the DB