diff --git a/forge-gui/res/cardsfolder/b/bulwark.txt b/forge-gui/res/cardsfolder/b/bulwark.txt
index bde1e0518ce..acd010c78fe 100644
--- a/forge-gui/res/cardsfolder/b/bulwark.txt
+++ b/forge-gui/res/cardsfolder/b/bulwark.txt
@@ -4,7 +4,7 @@ Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ PsychicSlap | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals X damage to target opponent, where X is the number of cards in your hand minus the number of cards in that player's hand.
 SVar:PsychicSlap:DB$ DealDamage | ValidTgts$ Opponent | NumDmg$ X
 SVar:A:Count$InYourHand
-SVar:B:Count$InOppHand
+SVar:B:Count$InTargetedHand
 SVar:X:SVar$A/Minus.B
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bulwark.jpg
diff --git a/forge-gui/res/cardsfolder/n/nyxathid.txt b/forge-gui/res/cardsfolder/n/nyxathid.txt
index 3f9041af772..91666f61c3f 100644
--- a/forge-gui/res/cardsfolder/n/nyxathid.txt
+++ b/forge-gui/res/cardsfolder/n/nyxathid.txt
@@ -6,7 +6,6 @@ K:ETBReplacement:Other:ChooseP
 SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | AILogic$ Curse | SpellDescription$ As CARDNAME enters the battlefield, choose an opponent.
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ -X | AddToughness$ -X | Description$ CARDNAME gets -1/-1 for each card in the chosen player's hand.
 SVar:X:Count$InChosenHand
-SVar:NeedsToPlayVar:Z LE5
-SVar:Z:Count$InOppHand
-SVar:Picture:http://www.wizards.com/global/images/magic/general/nyxathid.jpg
+SVar:NeedsToPlayVar:Z GE1
+SVar:Z:PlayerCountPropertyOpponent$HasPropertyHasCardsInHand_Card_LE5
 Oracle:As Nyxathid enters the battlefield, choose an opponent.\nNyxathid gets -1/-1 for each card in the chosen player's hand.
diff --git a/forge-gui/res/cardsfolder/s/struggle_for_sanity.txt b/forge-gui/res/cardsfolder/s/struggle_for_sanity.txt
index 44de975c107..969a959e71d 100644
--- a/forge-gui/res/cardsfolder/s/struggle_for_sanity.txt
+++ b/forge-gui/res/cardsfolder/s/struggle_for_sanity.txt
@@ -11,7 +11,6 @@ SVar:DBReturn:DB$ ChangeZoneAll | ChangeType$ Card.IsImprinted | Origin$ Exile |
 SVar:DBGoYard:DB$ ChangeZoneAll | ChangeType$ Card.IsNotImprinted+IsRemembered | Origin$ Exile | Destination$ Graveyard | SubAbility$ DBCleanup | StackDescription$ None
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
 SVar:X:Count$ValidHand Card.IsRemembered
-SVar:NeedsToPlayVar:Y GE2
-SVar:Y:Count$InOppHand
-SVar:Picture:http://www.wizards.com/global/images/magic/general/struggle_for_sanity.jpg
+SVar:NeedsToPlayVar:Y GE1
+SVar:Y:PlayerCountPropertyOpponent$HasPropertyHasCardsInHand_Card_GE2
 Oracle:Target opponent reveals their hand. That player exiles a card from it, then you exile a card from it. Repeat this process until all cards in that hand have been exiled. That player returns the cards they exiled this way to their hand and puts the rest into their graveyard.