BF: Important tournament fixes.