diff --git a/forge-gui/res/cardsfolder/f/ferocious_tigorilla.txt b/forge-gui/res/cardsfolder/f/ferocious_tigorilla.txt
index 06b499918a7..087c946c41c 100755
--- a/forge-gui/res/cardsfolder/f/ferocious_tigorilla.txt
+++ b/forge-gui/res/cardsfolder/f/ferocious_tigorilla.txt
@@ -4,7 +4,7 @@ Types:Creature Cat Ape
 PT:4/3
 K:ETBReplacement:Other:CounterChoice
 SVar:CounterChoice:DB$ GenericChoice | Defined$ You | Choices$ Trample,Menace | SpellDescription$ CARDNAME enters the battlefield with your choice of a trample counter or a menace counter on it.
-SVar:Trample:DB$ PutCounter | CounterType$ Trample | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a trample counter
-SVar:Menace:DB$ PutCounter | CounterType$ Menace | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a menace counter
+SVar:Trample:DB$ PutCounter | ETB$ True | CounterType$ Trample | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a trample counter
+SVar:Menace:DB$ PutCounter | ETB$ True | CounterType$ Menace | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a menace counter
 DeckHas:Ability$Counters
 Oracle:Ferocious Tigorilla enters the battlefield with your choice of a trample counter or a menace counter on it. (A creature with menace can't be blocked except by two or more creatures.)
diff --git a/forge-gui/res/cardsfolder/f/flycatcher_giraffid.txt b/forge-gui/res/cardsfolder/f/flycatcher_giraffid.txt
index 75fb6a261a3..f8714bfaad6 100644
--- a/forge-gui/res/cardsfolder/f/flycatcher_giraffid.txt
+++ b/forge-gui/res/cardsfolder/f/flycatcher_giraffid.txt
@@ -4,7 +4,7 @@ Types:Creature Antelope Lizard
 PT:3/5
 K:ETBReplacement:Other:CounterChoice
 SVar:CounterChoice:DB$ GenericChoice | Defined$ You | Choices$ Vigilance,Reach | SpellDescription$ CARDNAME enters the battlefield with your choice of a vigilance counter or a reach counter on it.
-SVar:Vigilance:DB$ PutCounter | CounterType$ Vigilance | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a vigilance counter on it
-SVar:Reach:DB$ PutCounter | CounterType$ Reach | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a reach counter on it
+SVar:Vigilance:DB$ PutCounter | ETB$ True | CounterType$ Vigilance | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a vigilance counter on it
+SVar:Reach:DB$ PutCounter | ETB$ True | CounterType$ Reach | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a reach counter on it
 DeckHas:Ability$Counters
 Oracle:Flycatcher Giraffid enters the battlefield with your choice of a vigilance counter or a reach counter on it.
diff --git a/forge-gui/res/cardsfolder/h/helica_glider.txt b/forge-gui/res/cardsfolder/h/helica_glider.txt
index 7686c61801c..77b9330ae66 100755
--- a/forge-gui/res/cardsfolder/h/helica_glider.txt
+++ b/forge-gui/res/cardsfolder/h/helica_glider.txt
@@ -4,7 +4,7 @@ Types:Creature Nightmare Squirrel
 PT:2/2
 K:ETBReplacement:Other:CounterChoice
 SVar:CounterChoice:DB$ GenericChoice | Defined$ You | Choices$ Flying,FirstStrike | SpellDescription$ CARDNAME enters the battlefield with your choice of a flying counter or a first strike counter on it.
-SVar:Flying:DB$ PutCounter | CounterType$ Flying | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a flying counter on it
-SVar:FirstStrike:DB$ PutCounter | CounterType$ First Strike | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a first strike counter on it
+SVar:Flying:DB$ PutCounter | ETB$ True | CounterType$ Flying | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a flying counter on it
+SVar:FirstStrike:DB$ PutCounter | ETB$ True | CounterType$ First Strike | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a first strike counter on it
 DeckHints:Ability$Counters
 Oracle:Helica Glider enters the battlefield with your choice of a flying counter or a first strike counter on it.
diff --git a/forge-gui/res/cardsfolder/v/villainous_wealth.txt b/forge-gui/res/cardsfolder/v/villainous_wealth.txt
index 01f8a774d55..eb8d3265dff 100644
--- a/forge-gui/res/cardsfolder/v/villainous_wealth.txt
+++ b/forge-gui/res/cardsfolder/v/villainous_wealth.txt
@@ -1,7 +1,7 @@
 Name:Villainous Wealth
 ManaCost:X B G U
 Types:Sorcery
-A:SP$ Dig | Cost$ X B G U | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | DigNum$ X | ChangNum$ All | References$ X | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBPlay | SpellDescription$ Target opponent exiles the top X cards of their library. You may cast any number of nonland cards with converted mana cost X or less from among them without paying their mana costs.
+A:SP$ Dig | Cost$ X B G U | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | DigNum$ X | ChangeNum$ All | References$ X | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBPlay | SpellDescription$ Target opponent exiles the top X cards of their library. You may cast any number of nonland cards with converted mana cost X or less from among them without paying their mana costs.
 SVar:DBPlay:DB$ Play | WithoutManaCost$ True | ValidZone$ Exile | Valid$ Card.nonLand+cmcLEX+IsRemembered | Amount$ All | Optional$ True | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$xPaid
diff --git a/forge-gui/res/cardsfolder/w/wingfold_pteron.txt b/forge-gui/res/cardsfolder/w/wingfold_pteron.txt
index 4707dfcdee3..f5d29b99502 100755
--- a/forge-gui/res/cardsfolder/w/wingfold_pteron.txt
+++ b/forge-gui/res/cardsfolder/w/wingfold_pteron.txt
@@ -4,7 +4,7 @@ Types:Creature Dinosaur
 PT:3/6
 K:ETBReplacement:Other:CounterChoice
 SVar:CounterChoice:DB$ GenericChoice | Defined$ You | Choices$ Flying,Hexproof | SpellDescription$ CARDNAME enters the battlefield with your choice of a flying counter or a hexproof counter on it.
-SVar:Flying:DB$ PutCounter | CounterType$ Flying | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a flying counter on it
-SVar:Hexproof:DB$ PutCounter | CounterType$ Hexproof | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a hexproof counter on it
+SVar:Flying:DB$ PutCounter | ETB$ True | CounterType$ Flying | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a flying counter on it
+SVar:Hexproof:DB$ PutCounter | ETB$ True | CounterType$ Hexproof | CounterNum$ 1 | SpellDescription$ CARDNAME enters the battlefield with a hexproof counter on it
 DeckHas:Ability$Counters
 Oracle:Wingfold Pteron enters the battlefield with your choice of a flying counter or a hexproof counter on it. (A creature with hexproof can't be the target of spells or abilities your opponents control.)
diff --git a/forge-gui/res/tokenscripts/ub_2_3_nightmare_mill.txt b/forge-gui/res/tokenscripts/ub_2_3_nightmare_mill.txt
index ee573892ab8..4859aaf4a7a 100644
--- a/forge-gui/res/tokenscripts/ub_2_3_nightmare_mill.txt
+++ b/forge-gui/res/tokenscripts/ub_2_3_nightmare_mill.txt
@@ -5,5 +5,5 @@ Colors:blue,black
 PT:2/3
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DBExile | TriggerDescription$ Whenever this creature attacks or blocks, each opponent exiles the top two cards of their library.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DBExile | Secondary$ True | TriggerDescription$ Whenever this creature attacks or blocks, each opponent exiles the top two cards of their library.
-SVar:DBExile:DB$ Dig | Defined$ Player.Opponent | DigNum$ 2 | ChangNum$ All | DestinationZone$ Exile
+SVar:DBExile:DB$ Dig | Defined$ Player.Opponent | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile
 Oracle:Whenever this creature attacks or blocks, each opponent exiles the top two cards of their library.