Fix solution mappings