Fixing mismatches.