diff --git a/forge-gui/res/cardsfolder/upcoming/pia_nalaar_consul_of_revival.txt b/forge-gui/res/cardsfolder/upcoming/pia_nalaar_consul_of_revival.txt
index 11783e569d9..a2129471328 100644
--- a/forge-gui/res/cardsfolder/upcoming/pia_nalaar_consul_of_revival.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pia_nalaar_consul_of_revival.txt
@@ -3,7 +3,7 @@ ManaCost:R W
 Types:Legendary Creature Human Artificer
 PT:2/3
 S:Mode$ Continuous | Affected$ Thopter.YouCtrl | AddKeyword$ Haste | Description$ Thopters you control have haste.
-T:Mode$ SpellCast | ValidCard$ Card.wasCastFromExile+nonToken | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you play a land from exile or cast a spell from exile, create a 1/1 colorless Thopter artifact creature token with flying.
+T:Mode$ SpellCast | ValidCard$ Card.wasCastFromExile | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you play a land from exile or cast a spell from exile, create a 1/1 colorless Thopter artifact creature token with flying.
 T:Mode$ LandPlayed | Origin$ Exile | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Whenever you play a land from exile or cast a spell from exile, create a 1/1 colorless Thopter artifact creature token with flying.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_a_thopter_flying | TokenOwner$ You
 DeckHints:Keyword$Cascade & Type$Thopter
diff --git a/forge-gui/res/cardsfolder/upcoming/plargg_and_nassari.txt b/forge-gui/res/cardsfolder/upcoming/plargg_and_nassari.txt
index 22b0611f285..644e3b1ae51 100644
--- a/forge-gui/res/cardsfolder/upcoming/plargg_and_nassari.txt
+++ b/forge-gui/res/cardsfolder/upcoming/plargg_and_nassari.txt
@@ -4,8 +4,8 @@ Types:Legendary Creature Orc Efreet
 PT:5/4
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDigUntil | TriggerDescription$ At the beginning of your upkeep, each player exiles cards from the top of their library until they exile a nonland card. An opponent choses a nonland card exiled this way. You may cast up to two spells from among the other cards exiled this way without paying their mana costs.
 SVar:TrigDigUntil:DB$ DigUntil | Defined$ Player | Valid$ Card.nonLand | FoundDestination$ Exile | RevealedDestination$ Exile | RememberFound$ True | SubAbility$ DBChoosePlayer | StackDescription$ SpellDescription 
-SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ OppPickOne
-SVar:OppPickOne:DB$ ChooseCard | ValidTgts$ Opponent | Amount$ 1 | Mandatory$ True | ChoiceTitle$ Choose a nonland card among the cards exiled (that can't be played) | Choices$ Card.IsRemembered+nonLand | ChoiceZone$ Exile | ImprintChosen$ True | SubAbility$ DBPlay
-SVar:DBPlay:DB$ Play | Defined$ Remembered.!Imprinted | WithoutManaCost$ True | ValidSA$ Spell | Optional$ True | Amount$ 2 | SubAbility$ DBCleanup | StackDescription$ None
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
+SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ OppPickOne
+SVar:OppPickOne:DB$ ChooseCard | Defined$ ChosenPlayer | Amount$ 1 | Mandatory$ True | ChoiceTitle$ Choose a nonland card among the cards exiled (that can't be played) | Choices$ Card.IsRemembered+nonLand | ChoiceZone$ Exile | SubAbility$ DBPlay
+SVar:DBPlay:DB$ Play | Defined$ Remembered.!ChosenCard | WithoutManaCost$ True | ValidSA$ Spell | Optional$ True | Amount$ 2 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:At the beginning of your upkeep, each player exiles cards from the top of their library until they exile a nonland card. An opponent choses a nonland card exiled this way. You may cast up to two spells from among the other cards exiled this way without paying their mana costs.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/rocco_street_chef.txt b/forge-gui/res/cardsfolder/upcoming/rocco_street_chef.txt
index d1d61db5034..c8d3081f195 100644
--- a/forge-gui/res/cardsfolder/upcoming/rocco_street_chef.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rocco_street_chef.txt
@@ -7,7 +7,7 @@ SVar:TrigExile:DB$ Dig | Defined$ Player | DigNum$ 1 | ChangeNum$ All | Destinat
 SVar:DBEffect:DB$ Effect | EffectOwner$ RememberedOwner | StaticAbilities$ STPlay | RememberObjects$ Remembered | Duration$ UntilYourNextEndStep | SubAbility$ DBCleanup | ForgetOnMoved$ Exile
 SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered+YouOwn | AffectedZone$ Exile | Description$ Until your next end step, each player may play the card they exiled this way.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-T:Mode$ SpellCast | ValidCard$ Card.wasCastFromExile+nonToken | ValidActivatingPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever a player plays a land from exile or casts a spell from exile, you put a +1/+1 counter on target creature and create a Food token.
+T:Mode$ SpellCast | ValidCard$ Card.wasCastFromExile | ValidActivatingPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever a player plays a land from exile or casts a spell from exile, you put a +1/+1 counter on target creature and create a Food token.
 T:Mode$ LandPlayed | Origin$ Exile | ValidCard$ Land | TriggerZones$ Battlefield | Execute$ TrigCounter | Secondary$ True | TriggerDescription$ Whenever a player plays a land from exile or casts a spell from exile, you put a +1/+1 counter on target creature and create a Food token.
 SVar:TrigCounter:DB$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBTokenFood
 SVar:DBTokenFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You