Changes some mappings..