diff --git a/forge-gui/res/cardsfolder/c/celestial_gatekeeper.txt b/forge-gui/res/cardsfolder/c/celestial_gatekeeper.txt
index d02ae8d924e..ba43414a6d5 100644
--- a/forge-gui/res/cardsfolder/c/celestial_gatekeeper.txt
+++ b/forge-gui/res/cardsfolder/c/celestial_gatekeeper.txt
@@ -4,7 +4,7 @@ Types:Creature Bird Cleric
 PT:2/2
 K:Flying
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, exile it, then return up to two target Bird and/or Cleric permanent cards from your graveyard to the battlefield.
-SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBChangeZone
+SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBChangeZone | Defined$ TriggeredCard
 SVar:DBChangeZone:DB$ChangeZone | ValidTgts$ Permanent.Bird,Permanent.Cleric | TargetsWithDefinedController$ TriggeredCardController | TargetMin$ 0 | TargetMax$ 2 | Origin$ Graveyard | Destination$ Battlefield
 SVar:Picture:http://www.wizards.com/global/images/magic/general/celestial_gatekeeper.jpg
 Oracle:Flying\nWhen Celestial Gatekeeper dies, exile it, then return up to two target Bird and/or Cleric permanent cards from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/l/loyal_cathar_unhallowed_cathar.txt b/forge-gui/res/cardsfolder/l/loyal_cathar_unhallowed_cathar.txt
index afcad7bb0a5..24dc4983c94 100644
--- a/forge-gui/res/cardsfolder/l/loyal_cathar_unhallowed_cathar.txt
+++ b/forge-gui/res/cardsfolder/l/loyal_cathar_unhallowed_cathar.txt
@@ -4,9 +4,9 @@ Types:Creature Human Soldier
 PT:2/2
 K:Vigilance
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDelay | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, return it to the battlefield transformed under your control at the beginning of the next end step.
-SVar:TrigDelay:AB$ DelayedTrigger | Cost$ 0 | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ return CARDNAME to the battlefield transformed
-SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ TrigTransform
-SVar:TrigTransform:DB$ SetState | Cost$ 0 | Defined$ Self | Mode$ Transform
+SVar:TrigDelay:AB$ DelayedTrigger | Cost$ 0 | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ TriggeredCard | TriggerDescription$ return CARDNAME to the battlefield transformed
+SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ DelayTriggerRemembered | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ TrigTransform
+SVar:TrigTransform:DB$ SetState | Cost$ 0 | Defined$ DelayTriggerRemembered | Mode$ Transform
 SVar:Picture:http://www.wizards.com/global/images/magic/general/loyal_cathar.jpg
 AlternateMode:DoubleFaced
 Oracle:Vigilance\nWhen Loyal Cathar dies, return it to the battlefield transformed under your control at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/m/mortus_strider.txt b/forge-gui/res/cardsfolder/m/mortus_strider.txt
index ef81a20a5ca..3635e899ed3 100644
--- a/forge-gui/res/cardsfolder/m/mortus_strider.txt
+++ b/forge-gui/res/cardsfolder/m/mortus_strider.txt
@@ -3,7 +3,7 @@ ManaCost:1 U B
 Types:Creature Skeleton
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, return it to its owner's hand.
-SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand
+SVar:TrigChangeZone:DB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | Defined$ TriggeredCard
 SVar:SacMe:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mortus_strider.jpg
 Oracle:When Mortus Strider dies, return it to its owner's hand.