Minor updates to DB access classes