Some bugfixes for tournaments

Can be merged at any time since no protocol changes this time