Fix incorrect datatype definitions