Fixed some data types