Fix matchers
Add descriptions to minimal dumps (they are useful for manual mapping)