Fixing some mappings.