Fixing the match_by_max_pmcc and the cluster driver