diff --git a/forge-gui/res/cardsfolder/upcoming/gandalf_westward_voyager.txt b/forge-gui/res/cardsfolder/upcoming/gandalf_westward_voyager.txt
index eae748ca105..be24bf2eb44 100644
--- a/forge-gui/res/cardsfolder/upcoming/gandalf_westward_voyager.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gandalf_westward_voyager.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Avatar Wizard
 PT:5/5
 T:Mode$ SpellCast | ValidCard$ Card.cmcGE5 | ValidActivatingPlayer$ You | Execute$ TrigReveal | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a spell with mana value 5 or greater, each opponent reveals the top card of their library. If any of those cards shares a card type with that spell, copy that spell, you may choose new targets for the copy, and each opponent draws a card. Otherwise, you draw a card. (A copy of a permanent spell becomes a token.)
 SVar:TrigReveal:DB$ PeekAndReveal | Defined$ Opponent | NoPeek$ True | ImprintRevealed$ True | SubAbility$ DBCopyCast
-SVar:DBCopyCast:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | ConditionDefined$ Imprinted | ConditionPresent$ Card.sharesCardTypeWith TriggeredCardLKICopy | MayChooseTarget$ True | Optional$ True | RememberNewCard$ True | SubAbility$ DBDrawAll
+SVar:DBCopyCast:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | ConditionDefined$ Imprinted | ConditionPresent$ Card.sharesCardTypeWith TriggeredCardLKICopy | MayChooseTarget$ True | RememberNewCard$ True | SubAbility$ DBDrawAll
 SVar:DBDrawAll:DB$ Draw | Defined$ Opponent | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ1 | SubAbility$ DBDrawYou
 SVar:DBDrawYou:DB$ Draw | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True | ClearRemembered$ True 
diff --git a/forge-gui/res/cardsfolder/upcoming/gilraen_dunedain_protector.txt b/forge-gui/res/cardsfolder/upcoming/gilraen_dunedain_protector.txt
index daaf550ef42..613f76af317 100644
--- a/forge-gui/res/cardsfolder/upcoming/gilraen_dunedain_protector.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gilraen_dunedain_protector.txt
@@ -3,8 +3,8 @@ ManaCost:2 W
 Types:Legendary Creature Human Noble
 PT:2/3
 A:AB$ ChangeZone | Cost$ 2 T | ValidTgts$ Creature.Other+YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select another target creature you control | SubAbility$ DBReturn | SpellDescription$ Exile another target creature you control. You may return that card to the battlefield under its owner's control. If you don't, at the beginning of the next end step, return that card to the battlefield under its owner's control with a vigilance counter and a lifelink counter on it.
-SVar:DBReturn:DB$ ChangeZone | Defined$ Targeted | Origin$ All | Optional$ True | Destination$ Battlefield | SubAbility$ DBDelayedTrigger
-SVar:DBDelayedTrigger:DB$ DelayedTrigger | RememberObjects$ Targeted | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigReturn | SpellDescription$ If you don't, at the beginning of the next end step, return that card to the battlefield under its owner's control with a vigilance counter and a lifelink counter on it.
+SVar:DBReturn:DB$ ChangeZone | Defined$ Targeted | Origin$ All | Optional$ True | Destination$ Battlefield | RememberChanged$ True | SubAbility$ DBDelayedTrigger
+SVar:DBDelayedTrigger:DB$ DelayedTrigger | RememberObjects$ Targeted | ConditionDefined$ Remembered | ConditionPresent$ Card.inZoneExile | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigReturn | SpellDescription$ If you don't, at the beginning of the next end step, return that card to the battlefield under its owner's control with a vigilance counter and a lifelink counter on it.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Exile | RememberChanged$ True | Destination$ Battlefield | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | ReplacementEffects$ ETBCounters | RememberObjects$ Remembered | ExileOnMoved$ Stack | SubAbility$ DBCleanup
 SVar:ETBCounters:Event$ Moved | ReplacementResult$ Updated | ActiveZones$ Command | Destination$ Battlefield | ValidCard$ Card.IsRemembered | ReplaceWith$ AddExtraCounter | Description$ return that card to the battlefield under its owner's control with a vigilance counter and a lifelink counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/mirkwood_trapper.txt b/forge-gui/res/cardsfolder/upcoming/mirkwood_trapper.txt
index ff9fc61f293..fbe304f4c4c 100644
--- a/forge-gui/res/cardsfolder/upcoming/mirkwood_trapper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mirkwood_trapper.txt
@@ -4,7 +4,7 @@ Types:Creature Elf Scout
 PT:1/4
 T:Mode$ AttackersDeclared | AttackedTarget$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a player attacks you, target attacking creature gets -2/-0 until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking | NumAtt$ -2 | IsCurse$ True
-T:Mode$ AttackersDeclared | AttackedTarget$ Player.Other | Execute$ TrigChoose | NoResolvingCheck$ True | IsPresent$ Creature.attackingYou | PresentCompare$ EQ0 | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player attacks, if they aren't attacking you, that player chooses an attacking creature. It gets +2/+0 until end of turn.
+T:Mode$ AttackersDeclared | AttackedTarget$ Player.Other,Planeswalker,Battle | Execute$ TrigChoose | IsPresent$ Creature.attackingYou | PresentCompare$ EQ0 | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player attacks, if they aren't attacking you, that player chooses an attacking creature. It gets +2/+0 until end of turn.
 SVar:TrigChoose:DB$ ChooseCard | Chooser$ TriggeredAttackingPlayer | Choices$ Creature.attacking | SubAbility$ DBPump 
 SVar:DBPump:DB$ Pump | Defined$ ChosenCard | NumAtt$ +2 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True