Db prefix issues fixed