Fixed some of the mappings