Bug Fixes for Tournament