Fix and add some mappings