XY Cup and fixes to some other tiers