diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index de909ca5e..fffd23ccf 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -882,7 +882,8 @@ void PlayerActions::actCreateToken(TokenInfo tokenToCreate)
     ExactCard correctedCard = CardDatabaseManager::query()->guessCard({lastTokenInfo.name, lastTokenInfo.providerId});
     if (correctedCard) {
         lastTokenInfo.name = correctedCard.getName();
-        lastTokenTableRow = TableZone::tableRowToGridY(correctedCard.getInfo().getUiAttributes().tableRow);
+        int tableRow = lastTokenInfo.faceDown ? 2 : correctedCard.getInfo().getUiAttributes().tableRow;
+        lastTokenTableRow = TableZone::tableRowToGridY(tableRow);
         if (lastTokenInfo.pt.isEmpty()) {
             lastTokenInfo.pt = correctedCard.getInfo().getPowTough();
         }
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.cpp b/libcockatrice_card/libcockatrice/card/database/card_database.cpp
index 951381aa4..edad46174 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database.cpp
@@ -92,7 +92,7 @@ void CardDatabase::refreshCachedReverseRelatedCards()
     }
 }
 
-void CardDatabase::addCard(CardInfoPtr card)
+void CardDatabase::addCard(const CardInfoPtr &card)
 {
     if (card == nullptr) {
         qCWarning(CardDatabaseLog) << "CardDatabase::addCard(nullptr)";
@@ -118,7 +118,7 @@ void CardDatabase::addCard(CardInfoPtr card)
     emit cardAdded(card);
 }
 
-void CardDatabase::removeCard(CardInfoPtr card)
+void CardDatabase::removeCard(const CardInfoPtr &card)
 {
     if (card.isNull()) {
         qCWarning(CardDatabaseLog) << "CardDatabase::removeCard(nullptr)";
@@ -143,7 +143,7 @@ void CardDatabase::removeCard(CardInfoPtr card)
     emit cardRemoved(card);
 }
 
-void CardDatabase::addSet(CardSetPtr set)
+void CardDatabase::addSet(const CardSetPtr &set)
 {
     sets.insert(set->getShortName(), set);
 }
@@ -215,7 +215,7 @@ void CardDatabase::notifyEnabledSetsChanged()
     emit cardDatabaseEnabledSetsChanged();
 }
 
-void CardDatabase::addFormat(FormatRulesPtr format)
+void CardDatabase::addFormat(const FormatRulesPtr &format)
 {
     formats.insert(format->formatName.toLower(), format);
-}
\ No newline at end of file
+}
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.h b/libcockatrice_card/libcockatrice/card/database/card_database.h
index 521be8fbc..44838962d 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database.h
@@ -88,7 +88,7 @@ public:
      * @brief Removes a card from the database.
      * @param card Pointer to the card to remove.
      */
-    void removeCard(CardInfoPtr card);
+    void removeCard(const CardInfoPtr &card);
 
     /** @brief Clears all cards, sets, and internal state. */
     void clear();
@@ -140,15 +140,15 @@ public slots:
      * @brief Adds a card to the database.
      * @param card CardInfoPtr to add.
      */
-    void addCard(CardInfoPtr card);
+    void addCard(const CardInfoPtr &card);
 
     /**
      * @brief Adds a set to the database.
      * @param set Pointer to CardSet to add.
      */
-    void addSet(CardSetPtr set);
+    void addSet(const CardSetPtr &set);
 
-    void addFormat(FormatRulesPtr format);
+    void addFormat(const FormatRulesPtr &format);
 
     /** @brief Loads card databases from configured paths. */
     void loadCardDatabases();