More mappings and a small little fix