Fixed up the data types

See commits