Fix the attribute data types