diff --git a/forge-gui/res/cardsfolder/g/goblin_grenadiers.txt b/forge-gui/res/cardsfolder/g/goblin_grenadiers.txt
index fb7ddfc6d09..1b1cfa946b6 100644
--- a/forge-gui/res/cardsfolder/g/goblin_grenadiers.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_grenadiers.txt
@@ -3,7 +3,6 @@ ManaCost:3 R
 Types:Creature Goblin
 PT:2/2
 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDestroyCreature | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may sacrifice it. If you do, destroy target creature and target land.
-SVar:TrigDestroyCreature:AB$ Destroy | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Mandatory$ True | SubAbility$ DBDestroyLand
-SVar:DBDestroyLand:DB$ Destroy | ValidTgts$ Land | TgtPrompt$ Select target land | Mandatory$ True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_grenadiers.jpg
+SVar:TrigDestroyCreature:AB$ Destroy | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBDestroyLand
+SVar:DBDestroyLand:DB$ Destroy | ValidTgts$ Land | TgtPrompt$ Select target land
 Oracle:Whenever Goblin Grenadiers attacks and isn't blocked, you may sacrifice it. If you do, destroy target creature and target land.
diff --git a/forge-gui/res/cardsfolder/g/goblin_vandal.txt b/forge-gui/res/cardsfolder/g/goblin_vandal.txt
index 7e7d5f34e44..f0aec5ccb84 100644
--- a/forge-gui/res/cardsfolder/g/goblin_vandal.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_vandal.txt
@@ -3,6 +3,6 @@ ManaCost:R
 Types:Creature Goblin Rogue
 PT:1/1
 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may pay {R}. If you do, destroy target artifact defending player controls and CARDNAME assigns no combat damage this turn.
-SVar:TrigDestroy:AB$ Destroy | Cost$ R | ValidTgts$ Artifact.DefenderCtrl | TgtPrompt$ Select target artifact defending player controls | SubAbility$ DBPump | Mandatory$ True
+SVar:TrigDestroy:AB$ Destroy | Cost$ R | ValidTgts$ Artifact.DefenderCtrl | TgtPrompt$ Select target artifact defending player controls | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage
 Oracle:Whenever Goblin Vandal attacks and isn't blocked, you may pay {R}. If you do, destroy target artifact defending player controls and Goblin Vandal assigns no combat damage this turn.
diff --git a/forge-gui/res/cardsfolder/m/magus_of_the_abyss.txt b/forge-gui/res/cardsfolder/m/magus_of_the_abyss.txt
index 38fbea8a9bb..0724a0959b2 100644
--- a/forge-gui/res/cardsfolder/m/magus_of_the_abyss.txt
+++ b/forge-gui/res/cardsfolder/m/magus_of_the_abyss.txt
@@ -3,7 +3,6 @@ ManaCost:3 B
 Types:Creature Human Wizard
 PT:4/3
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of their choice. It can't be regenerated.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Creature.nonArtifact+ActivePlayerCtrl | TgtPrompt$ Choose target nonartifact creature. | NoRegen$ True | TargetingPlayer$ TriggeredPlayer
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Creature.nonArtifact+ControlledBy TriggeredPlayer | TgtPrompt$ Choose target nonartifact creature | NoRegen$ True | TargetingPlayer$ TriggeredPlayer
 AI:RemoveDeck:Random
-SVar:Picture:http://www.wizards.com/global/images/magic/general/magus_of_the_abyss.jpg
 Oracle:At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of their choice. It can't be regenerated.