Fix a bunch of issues with mismatches