Fix setting data type issues