Fixed up data type mismatches