Fix problems with Gen 6 Tournaments

- Warning: Will break compatibility with versions of PO older than 2.2.9