DataBase helpers fixes