fix certain buggy mappings