Fix for data source data types