diff --git a/res/cardsfolder/g/ghostway.txt b/res/cardsfolder/g/ghostway.txt
index 7d61a11dc5a..ccc8749fdfa 100644
--- a/res/cardsfolder/g/ghostway.txt
+++ b/res/cardsfolder/g/ghostway.txt
@@ -2,9 +2,10 @@ Name:Ghostway
 ManaCost:2 W
 Types:Instant
 Text:no text
-A:SP$ChangeZoneAll | Cost$ 2 W | ChangeType$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | ForgetOtherTargets$ True | SubAbility$ DelTrig | SpellDescription$ Exile each creature you control. Return those cards to the battlefield under their owners' control at the beginning of the next end step.
-SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return exiled creatures to the battlefield.
-SVar:TrigReturn:AB$ChangeZoneAll | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | Defined$ Remembered
+A:SP$ChangeZoneAll | Cost$ 2 W | ChangeType$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DelTrig | SpellDescription$ Exile each creature you control. Return those cards to the battlefield under their owners' control at the beginning of the next end step.
+SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigGhostReturn | TriggerDescription$ Return exiled creatures to the battlefield.
+SVar:TrigGhostReturn:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Card.IsRemembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghostway.jpg
diff --git a/res/cardsfolder/p/pillory_of_the_sleepless.txt b/res/cardsfolder/p/pillory_of_the_sleepless.txt
index 871d7f1733f..19d7d2dd23e 100644
--- a/res/cardsfolder/p/pillory_of_the_sleepless.txt
+++ b/res/cardsfolder/p/pillory_of_the_sleepless.txt
@@ -4,8 +4,8 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 W B | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. & HIDDEN CARDNAME can't block. | AddTrigger$ PilloryLoseLife | AddSVar$ TrigLoseLife | Description$ Enchanted creature can't attack or block. Enchanted creature has "At the beginning of your upkeep, you lose 1 life."
-SVar:TriggerLoseLife:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ PilloryLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you lose 1 life.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. | AddTrigger$ TriggerTheSleepless | AddSVar$ PilloryLoseLife | Description$ Enchanted creature can't attack or block. Enchanted creature has "At the beginning of your upkeep, you lose 1 life."
+SVar:TriggerTheSleepless:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ PilloryLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you lose 1 life.
 SVar:PilloryLoseLife:AB$LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pillory_of_the_sleepless.jpg