diff --git a/forge-gui/res/cardsfolder/a/assault_formation.txt b/forge-gui/res/cardsfolder/a/assault_formation.txt
index 49e9ddaba4b..b89bca88e7a 100644
--- a/forge-gui/res/cardsfolder/a/assault_formation.txt
+++ b/forge-gui/res/cardsfolder/a/assault_formation.txt
@@ -2,8 +2,8 @@ Name:Assault Formation
 ManaCost:1 G
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ CARDNAME assigns combat damage equal to its toughness rather than its power | Description$ Each creature you control assigns combat damage equal to its toughness rather than its power.
-A:AB$ Animate | Cost$ G | ValidTgts$ Creature.withDefender | TgtPrompt$ Select target creature with defender | staticAbilities$ CanAttack | SpellDescription$ Target creature with defender can attack this turn as though it didn't have defender.
-SVar:CanAttack:Mode$ CanAttackDefender | ValidCard$ Card.Self | Description$ CARDNAME can attack this turn as though it didn't have defender.
+A:AB$ Effect | Cost$ G | ValidTgts$ Creature.withDefender | RememberObjects$ Targeted | TgtPrompt$ Select target creature with defender | StaticAbilities$ CanAttack | SpellDescription$ Target creature with defender can attack this turn as though it didn't have defender.
+SVar:CanAttack:Mode$ CanAttackDefender | ValidCard$ Creature.IsRemembered | Description$ This creature can attack this turn as though it didn't have defender.
 A:AB$ PumpAll | Cost$ 2 G | ValidCards$ Creature.YouCtrl | NumDef$ +1 | SpellDescription$ Creatures you control get +0/+1 until end of turn.
 SVar:PlayMain1:TRUE
 SVar:NonStackingEffect:True
diff --git a/forge-gui/res/cardsfolder/d/dark_maze.txt b/forge-gui/res/cardsfolder/d/dark_maze.txt
index c57f59e0776..34e07afa9cc 100644
--- a/forge-gui/res/cardsfolder/d/dark_maze.txt
+++ b/forge-gui/res/cardsfolder/d/dark_maze.txt
@@ -3,7 +3,7 @@ ManaCost:4 U
 Types:Creature Wall
 PT:4/5
 K:Defender
-A:AB$ Animate | Cost$ 0 | staticAbilities$ CanAttack | AtEOT$ Exile | SpellDescription$ CARDNAME can attack this turn as though it didn't have defender. Exile it at the beginning of the next end step.
-SVar:CanAttack:Mode$ CanAttackDefender | ValidCard$ Card.Self | Description$ CARDNAME can attack this turn as though it didn't have defender.
+A:AB$ Effect | Cost$ 0 | StaticAbilities$ CanAttack | AtEOT$ Exile | SpellDescription$ CARDNAME can attack this turn as though it didn't have defender. Exile it at the beginning of the next end step.
+SVar:CanAttack:Mode$ CanAttackDefender | ValidCard$ Card.EffectSource | Description$ EFFECTSOURCE can attack this turn as though it didn't have defender.
 AI:RemoveDeck:All
 Oracle:Defender (This creature can't attack.)\n{0}: Dark Maze can attack this turn as though it didn't have defender. Exile it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/g/glade_watcher.txt b/forge-gui/res/cardsfolder/g/glade_watcher.txt
index 103e9658f18..a657890ed4d 100644
--- a/forge-gui/res/cardsfolder/g/glade_watcher.txt
+++ b/forge-gui/res/cardsfolder/g/glade_watcher.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Elemental
 PT:3/3
 K:Defender
-A:AB$ Animate | Cost$ G | staticAbilities$ CanAttack | CheckSVar$ FormidableTest | SVarCompare$ GE8 | PrecostDesc$ Formidable — | SpellDescription$ CARDNAME can attack this turn as though it didn't have defender. Activate only if creatures you control have total power 8 or greater.
-SVar:CanAttack:Mode$ CanAttackDefender | ValidCard$ Card.Self | Description$ CARDNAME can attack this turn as though it didn't have defender.
+A:AB$ Effect | Cost$ G | StaticAbilities$ CanAttack | CheckSVar$ FormidableTest | SVarCompare$ GE8 | PrecostDesc$ Formidable — | SpellDescription$ CARDNAME can attack this turn as though it didn't have defender. Activate only if creatures you control have total power 8 or greater.
+SVar:CanAttack:Mode$ CanAttackDefender | ValidCard$ Card.EffectSource | Description$ EFFECTSOURCE can attack this turn as though it didn't have defender.
 SVar:FormidableTest:Count$SumPower_Creature.YouCtrl
 Oracle:Defender\nFormidable — {G}: Glade Watcher can attack this turn as though it didn't have defender. Activate only if creatures you control have total power 8 or greater.