diff --git a/cockatrice/src/client/ui/layouts/flow_layout.cpp b/cockatrice/src/client/ui/layouts/flow_layout.cpp
index 3a91e39c3..f7ebbfb79 100644
--- a/cockatrice/src/client/ui/layouts/flow_layout.cpp
+++ b/cockatrice/src/client/ui/layouts/flow_layout.cpp
@@ -551,7 +551,10 @@ void FlowLayout::addItem(QLayoutItem *item)
 void FlowLayout::insertWidgetAtIndex(QWidget *toInsert, int index)
 {
     addChildWidget(toInsert);
-    items.insert(qBound(0, index, std::max(0, static_cast<int>(items.size()))), new QWidgetItem(toInsert));
+
+    // We don't want to fail on an index that violates the bounds, so we just clamp it.
+    int boundedIndex = qBound(0, index, qMax(0, static_cast<int>(items.size())));
+    items.insert(boundedIndex, new QWidgetItem(toInsert));
 
     invalidate();
 }
diff --git a/cockatrice/src/client/ui/layouts/overlap_layout.cpp b/cockatrice/src/client/ui/layouts/overlap_layout.cpp
index ea5bd8d37..9bf5e8468 100644
--- a/cockatrice/src/client/ui/layouts/overlap_layout.cpp
+++ b/cockatrice/src/client/ui/layouts/overlap_layout.cpp
@@ -57,7 +57,7 @@ OverlapLayout::~OverlapLayout()
 void OverlapLayout::insertWidgetAtIndex(QWidget *toInsert, int index)
 {
     addChildWidget(toInsert);
-    int clampedIndex = qBound(0, index, std::max(0, static_cast<int>(itemList.size())));
+    int clampedIndex = qBound(0, index, qMax(0, static_cast<int>(itemList.size())));
     itemList.insert(clampedIndex, new QWidgetItem(toInsert));
 
     for (int i = clampedIndex; i < itemList.size(); ++i) {
diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
index 173050e27..c4ccfdcb3 100644
--- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
@@ -28,10 +28,10 @@ CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
 
     layout->addWidget(banner);
 
-    // CardGroupDisplayWidget::updateCardDisplays();
+    CardGroupDisplayWidget::updateCardDisplays();
 
-    // connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition);
-    // connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval);
+    connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition);
+    connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval);
 }
 
 QWidget *CardGroupDisplayWidget::constructWidgetForIndex(int rowIndex)
@@ -78,7 +78,6 @@ void CardGroupDisplayWidget::onCardAddition(const QModelIndex &parent, int first
 
 void CardGroupDisplayWidget::onCardRemoval(const QModelIndex &parent, int first, int last)
 {
-    Q_UNUSED(parent);
     Q_UNUSED(first);
     Q_UNUSED(last);
     if (parent == trackedIndex) {
diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
index 94872e1db..90a10396e 100644
--- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
@@ -39,7 +39,6 @@ FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,
     }
 
     FlatCardGroupDisplayWidget::updateCardDisplays();
-    // connect(deckListModel, &DeckListModel::dataChanged, this, &FlatCardGroupDisplayWidget::updateCardDisplays);
     disconnect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition);
     disconnect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval);