diff --git a/forge-gui/res/cardsfolder/a/adamaro_first_to_desire.txt b/forge-gui/res/cardsfolder/a/adamaro_first_to_desire.txt
index a948e9d6cef..ea930940263 100644
--- a/forge-gui/res/cardsfolder/a/adamaro_first_to_desire.txt
+++ b/forge-gui/res/cardsfolder/a/adamaro_first_to_desire.txt
@@ -3,7 +3,7 @@ ManaCost:1 R R
 Types:Legendary Creature Spirit
 PT:*/*
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of cards in the hand of the opponent with the most cards in hand.
-SVar:X:Count$InOppHand
+SVar:X:PlayerCountOpponents$HighestCardsInHand
 SVar:AntiBuffedBy:Card
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adamaro_first_to_desire.jpg
 Oracle:Adamaro, First to Desire's power and toughness are each equal to the number of cards in the hand of the opponent with the most cards in hand.
diff --git a/forge-gui/res/cardsfolder/a/avatar_of_will.txt b/forge-gui/res/cardsfolder/a/avatar_of_will.txt
index ed1bd4a154b..819415d6477 100644
--- a/forge-gui/res/cardsfolder/a/avatar_of_will.txt
+++ b/forge-gui/res/cardsfolder/a/avatar_of_will.txt
@@ -4,6 +4,6 @@ Types:Creature Avatar
 PT:5/6
 K:Flying
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 6 | EffectZone$ All | CheckSVar$ X | SVarCompare$ EQ0 | Description$ If an opponent has no cards in hand, CARDNAME costs {6} less to cast.
-SVar:X:Count$InOppHand
+SVar:X:PlayerCountOpponents$LowestCardsInHand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/avatar_of_will.jpg
 Oracle:If an opponent has no cards in hand, Avatar of Will costs {6} less to cast.\nFlying
diff --git a/forge-gui/res/cardsfolder/g/guul_draz_specter.txt b/forge-gui/res/cardsfolder/g/guul_draz_specter.txt
index 2bd1e8ce2ab..648b6730ac0 100644
--- a/forge-gui/res/cardsfolder/g/guul_draz_specter.txt
+++ b/forge-gui/res/cardsfolder/g/guul_draz_specter.txt
@@ -6,6 +6,6 @@ K:Flying
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddToughness$ 3 | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME gets +3/+3 as long as an opponent has no cards in hand.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDiscard | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
-SVar:X:Count$InOppHand
+SVar:X:PlayerCountOpponents$LowestCardsInHand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/guul_draz_specter.jpg
 Oracle:Flying\nGuul Draz Specter gets +3/+3 as long as an opponent has no cards in hand.\nWhenever Guul Draz Specter deals combat damage to a player, that player discards a card.
diff --git a/forge-gui/res/cardsfolder/p/pulse_of_the_grid.txt b/forge-gui/res/cardsfolder/p/pulse_of_the_grid.txt
index b69253ba344..54182882218 100644
--- a/forge-gui/res/cardsfolder/p/pulse_of_the_grid.txt
+++ b/forge-gui/res/cardsfolder/p/pulse_of_the_grid.txt
@@ -3,9 +3,9 @@ ManaCost:1 U U
 Types:Instant
 A:SP$ Draw | Cost$ 1 U U | NumCards$ 2 | SubAbility$ DBDiscard | SpellDescription$ Draw two cards, then discard a card. Then if an opponent has more cards in hand than you, return CARDNAME to its owner's hand.
 SVar:DBDiscard:DB$Discard | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ TrigReturn
-SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X,Y
+SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand | ConditionCheckSVar$ X | ConditionSVarCompare$ GTY | References$ X,Y
 SVar:Y:Count$CardsInYourHand
-SVar:X:Count$CardsInOppHand/Minus.Y
+SVar:X:PlayerCountOpponents$HighestCardsInHand
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pulse_of_the_grid.jpg
 Oracle:Draw two cards, then discard a card. Then if an opponent has more cards in hand than you, return Pulse of the Grid to its owner's hand.