- Minor fixes to data types