diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_tournament_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_tournament_settings.cpp
index 49dbf065a..cb69e042d 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_tournament_settings.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_tournament_settings.cpp
@@ -2,7 +2,6 @@
 
 #include <QDialogButtonBox>
 #include <QFormLayout>
-#include <QLabel>
 #include <QPushButton>
 #include <QSpinBox>
 
@@ -15,13 +14,9 @@ DlgTournamentSettings::DlgTournamentSettings(QWidget *parent) : QDialog(parent)
     gamesPerMatchSpin = new QSpinBox(this);
     gamesPerMatchSpin->setRange(1, 5);
     gamesPerMatchSpin->setValue(1);
-    gamesPerMatchSpin->setToolTip(tr("Number of games per match (e.g., 3 for Best of 3)"));
+    gamesPerMatchSpin->setToolTip(tr("Number of games per match (e.g., 3 for Best of 3, 5 for Best of 5)"));
     mainLayout->addRow(tr("Games per match:"), gamesPerMatchSpin);
 
-    QLabel *hintLabel = new QLabel(tr("Set to 3 for Best of 3, 5 for Best of 5, etc."), this);
-    hintLabel->setStyleSheet("color: palette(placeholderText);");
-    mainLayout->addRow(QString(), hintLabel);
-
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgTournamentSettings::actOK);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
diff --git a/cockatrice/src/interface/widgets/draft/tournament_widget.cpp b/cockatrice/src/interface/widgets/draft/tournament_widget.cpp
index e7aa356b4..8693b3da7 100644
--- a/cockatrice/src/interface/widgets/draft/tournament_widget.cpp
+++ b/cockatrice/src/interface/widgets/draft/tournament_widget.cpp
@@ -185,7 +185,7 @@ void TournamentWidget::rebuildTables(const Event_TournamentState &state)
         QString statusStr;
         if (pairing.player2_id() == -1) {
             statusStr = tr("BYE");
-        } else if (pairing.winner_id() != -1) {
+        } else if (pairing.has_winner_id() || pairing.is_draw()) {
             statusStr = tr("Finished");
         } else {
             statusStr = tr("vs");
@@ -211,7 +211,7 @@ void TournamentWidget::resolveCurrentGameId(const Event_TournamentState &state)
 
     for (int i = 0; i < state.pairings_size(); ++i) {
         const auto &pairing = state.pairings(i);
-        if (pairing.game_id() == -1) {
+        if (pairing.game_id() == -1 || pairing.has_winner_id() || pairing.is_draw()) {
             continue;
         }
         if (!hasOwnLivePairing && localPlayerId != -1 &&