Automatic attribute mapping, fixes to mapping solver