DataBase Fixes