More data type fixing