Fix up more of the $dbh entries