Fix custom mappings