Fix a few mapping issues.