more fixes to DB package