Fixes to MatchingDistribution