Fixed some DBI issues