DB MINOR FIXES