diff --git a/forge-gui/res/cardsfolder/upcoming/flockchaser_phantom.txt b/forge-gui/res/cardsfolder/upcoming/flockchaser_phantom.txt
index 89bfc1ef47b..18635ef41aa 100644
--- a/forge-gui/res/cardsfolder/upcoming/flockchaser_phantom.txt
+++ b/forge-gui/res/cardsfolder/upcoming/flockchaser_phantom.txt
@@ -8,7 +8,7 @@ K:Vigilance
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ Whenever CARDNAME attacks, the next spell you cast this turn has convoke.
 SVar:TrigEffect:DB$ Effect | StaticAbilities$ GrandConvoke | Triggers$ ExileEffect
 SVar:GrandConvoke:Mode$ Continuous | EffectZone$ Command | Affected$ Card.YouCtrl | AffectedZone$ Stack | AddKeyword$ Convoke | Description$ The next spell you cast this turn has convoke.
-SVar:ExileEffect:Mode$ SpellCast | EffectZone$ Command | Valid$ Card.YouCtrl | AffectedZone$ Stack | Execute$ RemoveEffect | Static$ True
+SVar:ExileEffect:Mode$ SpellCast | EffectZone$ Command | ValidCard$ Card.YouCtrl | AffectedZone$ Stack | Execute$ RemoveEffect | Static$ True
 SVar:RemoveEffect:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined$ Self
 SVar:HasAttackEffect:TRUE
 Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nFlying, vigilance\nWhenever Flockchaser Phantom attacks, the next spell you cast this turn has convoke.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/locthwain_lancer.txt b/forge-gui/res/cardsfolder/upcoming/locthwain_lancer.txt
index 2a098ebe1ee..17f6e2eb7a6 100644
--- a/forge-gui/res/cardsfolder/upcoming/locthwain_lancer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/locthwain_lancer.txt
@@ -3,8 +3,8 @@ ManaCost:4 B
 Types:Creature Human Knight
 PT:5/5
 K:Menace
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Knight.nonToken+YouCtrl | Execute$ TrigDraw | TriggerDescription$ Whenever a nontoken Knight you control dies, each opponent loses 1 life and you draw a card.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$ LoseLife | Defined$ Opponent | LifeAmount$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Knight.nonToken+YouCtrl | Execute$ TrigLoseLife | TriggerDescription$ Whenever a nontoken Knight you control dies, each opponent loses 1 life and you draw a card.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ Opponent | LifeAmount$ 1 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife
 DeckHints:Type$Knight
 Oracle:Menace\nWhenever a nontoken Knight you control dies, each opponent loses 1 life and you draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/vodalian_wave_knight.txt b/forge-gui/res/cardsfolder/upcoming/vodalian_wave_knight.txt
index aa366e72fa4..e456869deb2 100644
--- a/forge-gui/res/cardsfolder/upcoming/vodalian_wave_knight.txt
+++ b/forge-gui/res/cardsfolder/upcoming/vodalian_wave_knight.txt
@@ -3,7 +3,7 @@ ManaCost:2 W U
 Types:Creature Merfolk Knight
 PT:3/3
 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounterAll | TriggerDescription$ Whenever you draw a card, put a +1/+1 counter on each other Merfolk and/or Knight you control.
-SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Knight.YouCtrl+Other,Merfolk.YouCtrl+Other | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBGainLife
+SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Knight.YouCtrl+Other,Merfolk.YouCtrl+Other | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters
 DeckHints:Type$Merfolk|Knight
 Oracle:Whenever you draw a card, put a +1/+1 counter on each other Merfolk and/or Knight you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/wand_of_the_worldsoul.txt b/forge-gui/res/cardsfolder/upcoming/wand_of_the_worldsoul.txt
index 498dc22c94a..45e010d0981 100644
--- a/forge-gui/res/cardsfolder/upcoming/wand_of_the_worldsoul.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wand_of_the_worldsoul.txt
@@ -5,6 +5,6 @@ K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Effect | Cost$ T | StaticAbilities$ GrandConvoke | Triggers$ ExileEffect | SpellDescription$ The next spell you cast this turn has convoke.
 SVar:GrandConvoke:Mode$ Continuous | EffectZone$ Command | Affected$ Card.YouCtrl | AffectedZone$ Stack | AddKeyword$ Convoke | Description$ The next spell you cast this turn has convoke.
-SVar:ExileEffect:Mode$ SpellCast | EffectZone$ Command | Valid$ Card.YouCtrl | AffectedZone$ Stack | Execute$ RemoveEffect | Static$ True
+SVar:ExileEffect:Mode$ SpellCast | EffectZone$ Command | ValidCard$ Card.YouCtrl | AffectedZone$ Stack | Execute$ RemoveEffect | Static$ True
 SVar:RemoveEffect:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined$ Self
 Oracle:Wand of the Worldsoul enters the battlefield tapped.\n{T}: Add {W}.\n{T}: The next spell you cast this turn has convoke.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/wildfire_awakener.txt b/forge-gui/res/cardsfolder/upcoming/wildfire_awakener.txt
index 5a4ee532ce8..e9a98cedfd4 100644
--- a/forge-gui/res/cardsfolder/upcoming/wildfire_awakener.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wildfire_awakener.txt
@@ -3,7 +3,7 @@ ManaCost:X 1 R W
 Types:Creature Human Wizard
 PT:3/2
 K:Convoke
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ TriggerDescription$ When CARDNAME enters the battlefield, create X 1/1 red Elemental creature tokens with "Whenever this creature becomes tapped, it deals 1 damage to target player."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create X 1/1 red Elemental creature tokens with "Whenever this creature becomes tapped, it deals 1 damage to target player."
 SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ r_1_1_elemental_ping | TokenOwner$ You
 SVar:X:Count$xPaid
 DeckHas:Ability$Token & Type$Elemental
diff --git a/forge-gui/res/tokenscripts/r_1_1_elemental_ping.txt b/forge-gui/res/tokenscripts/r_1_1_elemental_ping.txt
index e254d1d231d..9a40e4d2938 100644
--- a/forge-gui/res/tokenscripts/r_1_1_elemental_ping.txt
+++ b/forge-gui/res/tokenscripts/r_1_1_elemental_ping.txt
@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Creature Elemental
 Colors:red
 PT:1/1
-T:Mode$ Taps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ TriggerDescription$ Whenever this creature becomes tapped, it deals 1 damage to target player
+T:Mode$ Taps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever this creature becomes tapped, it deals 1 damage to target player
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Player | NumDmg$ 1
 Oracle:Whenever this creature becomes tapped, it deals 1 damage to target player
\ No newline at end of file