fixed some bad mappings