DB data types fix