Fix to data types