Fix to dataset types