r9162: Fix a couple of data types