Some fixes at Affinity/antiaffinity

No match.