Buffs: better support for variable team counts