Fix mismatches