fix a couple of data types