Fixes for the tournament diagram work.