Fix find mappings