Admin. Fixes to DB class