Fixup mismatches