Minor fixes pertaining to the database management