diff --git a/forge-gui/res/cardsfolder/e/enatu_golem.txt b/forge-gui/res/cardsfolder/e/enatu_golem.txt
index b0d53981ce4..10406dd3860 100644
--- a/forge-gui/res/cardsfolder/e/enatu_golem.txt
+++ b/forge-gui/res/cardsfolder/e/enatu_golem.txt
@@ -3,5 +3,5 @@ ManaCost:6
 Types:Artifact Creature Golem
 PT:3/5
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME dies, you gain 4 life.
-SVar:TrigGainLife:DB$ GainLife | Defined$ TriggeredCardController | LifeAmount$ 4
+SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4
 Oracle:When Enatu Golem dies, you gain 4 life.
diff --git a/forge-gui/res/cardsfolder/m/merfolk_looter.txt b/forge-gui/res/cardsfolder/m/merfolk_looter.txt
index 3a2cac37d1e..addf58dc9d7 100644
--- a/forge-gui/res/cardsfolder/m/merfolk_looter.txt
+++ b/forge-gui/res/cardsfolder/m/merfolk_looter.txt
@@ -4,4 +4,5 @@ Types:Creature Merfolk Rogue
 PT:1/1
 A:AB$ Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
+DeckHas:Ability$Discard
 Oracle:{T}: Draw a card, then discard a card.
diff --git a/forge-gui/res/cardsfolder/s/soul_seizer_ghastly_haunting.txt b/forge-gui/res/cardsfolder/s/soul_seizer_ghastly_haunting.txt
index c10b6cf6f86..7561afb5b85 100644
--- a/forge-gui/res/cardsfolder/s/soul_seizer_ghastly_haunting.txt
+++ b/forge-gui/res/cardsfolder/s/soul_seizer_ghastly_haunting.txt
@@ -4,8 +4,9 @@ Types:Creature Spirit
 PT:1/3
 K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigTransform | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may transform it. If you do, attach it to target creature that player controls.
-SVar:TrigTransform:DB$ SetState | Defined$ Self | Mode$ Transform | SubAbility$ DBAttach
-SVar:DBAttach:DB$ Attach | ValidTgts$ Creature.ControlledBy TriggeredTarget | TgtPrompt$ Select target creature that damaged player controls | AILogic$ GainControl
+SVar:TrigTransform:DB$ SetState | Defined$ Self | Mode$ Transform | RememberChanged$ True | SubAbility$ DBAttach
+SVar:DBAttach:DB$ Attach | ValidTgts$ Creature.ControlledBy TriggeredTarget | TgtPrompt$ Select target creature that damaged player controls | AILogic$ GainControl | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AlternateMode:DoubleFaced
 Oracle:Flying\nWhen Soul Seizer deals combat damage to a player, you may transform it. If you do, attach it to target creature that player controls.