diff --git a/forge-gui/res/cardsfolder/c/cloudshift.txt b/forge-gui/res/cardsfolder/c/cloudshift.txt
index 16673b9921a..019d37e4790 100644
--- a/forge-gui/res/cardsfolder/c/cloudshift.txt
+++ b/forge-gui/res/cardsfolder/c/cloudshift.txt
@@ -2,7 +2,7 @@ Name:Cloudshift
 ManaCost:W
 Types:Instant
 A:SP$ ChangeZone | Cost$ W | ValidTgts$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature you control | RememberTargets$ True | SubAbility$ DBReturn | SpellDescription$ Exile target creature you control, then return that card to the battlefield under your control.
-SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | GainControl$ True | SubAbility$ DBCleanup
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ All | Destination$ Battlefield | GainControl$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cloudshift.jpg
diff --git a/forge-gui/res/cardsfolder/c/conjurer's_closet.txt b/forge-gui/res/cardsfolder/c/conjurer's_closet.txt
index 4e11ddeef0a..3db70b093e5 100644
--- a/forge-gui/res/cardsfolder/c/conjurer's_closet.txt
+++ b/forge-gui/res/cardsfolder/c/conjurer's_closet.txt
@@ -3,7 +3,7 @@ ManaCost:5
 Types:Artifact
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ ConjurerExile | OptionalDecider$ You | TriggerDescription$ At the beginning of your end step, you may exile target creature you control, then return it to the battlefield under your control.
 SVar:ConjurerExile:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to flicker | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ ConjurerReturn
-SVar:ConjurerReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | GainControl$ True | SubAbility$ DBCleanup
+SVar:ConjurerReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ All | Destination$ Battlefield | GainControl$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/conjurers_closet.jpg
diff --git a/forge-gui/res/cardsfolder/d/deadeye_navigator.txt b/forge-gui/res/cardsfolder/d/deadeye_navigator.txt
index b6d8564f938..c9825f22b2d 100644
--- a/forge-gui/res/cardsfolder/d/deadeye_navigator.txt
+++ b/forge-gui/res/cardsfolder/d/deadeye_navigator.txt
@@ -5,6 +5,6 @@ PT:5/5
 K:Soulbond
 S:Mode$ Continuous | Affected$ Creature.PairedWith,Card.Self+Paired | AddAbility$ DeadeyeFlicker | AddSVar$ DeadeyeReturn | Description$ As long as CARDNAME is paired with another creature, both creatures have "{1}{U}: Exile this creature, then return it to the battlefield under your control."
 SVar:DeadeyeFlicker:AB$ ChangeZone | Cost$ 1 U | Defined$ Self | Origin$ Battlefield | Destination$ Exile | SubAbility$ DeadeyeReturn | RememberChanged$ True | ForgetOtherRemembered$ True | SpellDescription$ Exile this creature, then return it to the battlefield under your control.
-SVar:DeadeyeReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | GainControl$ True
+SVar:DeadeyeReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ All | Destination$ Battlefield | GainControl$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deadeye_navigator.jpg
 Oracle:Soulbond (You may pair this creature with another unpaired creature when either enters the battlefield. They remain paired for as long as you control both of them.)\nAs long as Deadeye Navigator is paired with another creature, each of those creatures has "{1}{U}: Exile this creature, then return it to the battlefield under your control."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/f/flicker.txt b/forge-gui/res/cardsfolder/f/flicker.txt
index e70032c03e3..11d5aa51b6f 100644
--- a/forge-gui/res/cardsfolder/f/flicker.txt
+++ b/forge-gui/res/cardsfolder/f/flicker.txt
@@ -2,7 +2,7 @@ Name:Flicker
 ManaCost:1 W
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 1 W | ValidTgts$ Permanent.nonToken | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target nontoken permanent | RememberTargets$ True | SubAbility$ DBReturn | SpellDescription$ Exile target nontoken permanent, then return it to the battlefield under its owner's control.
-SVar:DBReturn:DB$ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
+SVar:DBReturn:DB$ChangeZone | Defined$ Remembered | Origin$ All | Destination$ Battlefield | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flicker.jpg