diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
index 9edb07ce59c..39bc6ade625 100644
--- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
+++ b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
@@ -303,7 +303,7 @@ public class PlayerControllerAi extends PlayerController {
 
         // TODO: Currently this logic uses the same routine as Scry. Possibly differentiate this and implement
         // a specific logic for Surveil (e.g. maybe to interact better with Reanimator strategies etc.).
-        if (getPlayer().getCardsIn(ZoneType.Hand).size() <= getAi().getIntProperty(AiProps.SURVEIL_NUM_CARDS_IN_LIBRARY_TO_BAIL)) {
+        if (getPlayer().getCardsIn(ZoneType.Library).size() <= getAi().getIntProperty(AiProps.SURVEIL_NUM_CARDS_IN_LIBRARY_TO_BAIL)) {
             toTop.addAll(topN);
         } else {
             for (Card c : topN) {
diff --git a/forge-gui/res/cardsfolder/c/camaraderie.txt b/forge-gui/res/cardsfolder/c/camaraderie.txt
index 84b6367e858..8f35b8b0670 100644
--- a/forge-gui/res/cardsfolder/c/camaraderie.txt
+++ b/forge-gui/res/cardsfolder/c/camaraderie.txt
@@ -5,4 +5,5 @@ A:SP$ GainLife | Cost$ 4 G W | Defined$ You | LifeAmount$ X | References$ X | Su
 SVar:DBDraw:DB$ Draw | NumCards$ X | References$ X | SubAbility$ DBPumpAll
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Creatures you control get +1/+1 until end of turn.
 SVar:X:Count$TypeYouCtrl.Creature
+SVar:PlayMain1:TRUE
 Oracle:You gain X life and draw X cards, where X is the number of creatures you control. Creatures you control get +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/m/moodmark_painter.txt b/forge-gui/res/cardsfolder/m/moodmark_painter.txt
index 11dd131d1b5..4b81f4f065f 100644
--- a/forge-gui/res/cardsfolder/m/moodmark_painter.txt
+++ b/forge-gui/res/cardsfolder/m/moodmark_painter.txt
@@ -5,4 +5,5 @@ PT:2/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gains menace and gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard. (It can't blocked except by two or more creatures.)
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | NumDef$ 0 | KW$ Menace | References$ X
 SVar:X:Count$TypeInYourYard.Creature
+SVar:PlayMain1:TRUE
 Oracle:Undergrowth — When Moodmark Painter enters the battlefield, target creature gains menace and gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard. (It can't blocked except by two or more creatures.)