Fix mappings and mistakes