diff --git a/forge-gui/res/cardsfolder/upcoming/arni_metalbrow.txt b/forge-gui/res/cardsfolder/upcoming/arni_metalbrow.txt
index 71198bc2322..44b9831bbb9 100644
--- a/forge-gui/res/cardsfolder/upcoming/arni_metalbrow.txt
+++ b/forge-gui/res/cardsfolder/upcoming/arni_metalbrow.txt
@@ -4,7 +4,6 @@ Types:Legendary Creature Human Berserker
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+attacking | Execute$ TrigChangeZone | TriggerDescription$ Whenever a creature you control attacks or a creature enters the battlefield under your control attacking, you may pay {1}{R}. If you do, you may put a creature card with mana value less than that creature's mana value from your hand onto the battlefield tapped and attacking.
 T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | Execute$ TrigChangeZone | Secondary$ True | TriggerDescription$ Whenever a creature you control attacks or a creature enters the battlefield under your control attacking, you may pay {1}{R}. If you do, you may put a creature card with mana value less than that creature's mana value from your hand onto the battlefield tapped and attacking.
-SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 1 R | Origin$ Hand | ChangeNum$ 1 | Destination$ Battlefield | ChangeType$ Creature.cmcLTX+YouCtrl | ChangeNum$ 1 | Tapped$ True | Attacking$ True | Hidden$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True 
+SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 1 R | Origin$ Hand | ChangeNum$ 1 | Destination$ Battlefield | ChangeType$ Creature.cmcLTX+YouCtrl | ChangeNum$ 1 | Tapped$ True | Attacking$ True
 SVar:X:TriggeredAttacker$CardManaCost
 Oracle:Whenever a creature you control attacks or a creature enters the battlefield under your control attacking, you may pay {1}{R}. If you do, you may put a creature card with mana value less than that creature's mana value from your hand onto the battlefield tapped and attacking.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/blot_out.txt b/forge-gui/res/cardsfolder/upcoming/blot_out.txt
index 8d7ff1d9efd..5875ad36776 100644
--- a/forge-gui/res/cardsfolder/upcoming/blot_out.txt
+++ b/forge-gui/res/cardsfolder/upcoming/blot_out.txt
@@ -3,6 +3,7 @@ ManaCost:2 B
 Types:Instant
 A:SP$ ChooseCard | ValidTgts$ Opponent | Choices$ Creature.TargetedPlayerCtrl+cmcEQX,Planeswalker.TargetedPlayerCtrl+cmcEQX | ChoiceTitle$ Choose a creature or planeswalker with the highest mana value to sacrifice | Mandatory$ True | RememberChosen$ True | SubAbility$ DBExile | SpellDescription$ Target opponent exiles a creature or planeswalker they control with the greatest mana value among creatures and planeswalkers they control
 SVar:DBExile:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:X:SVar$Y/LimitMin.Z
 SVar:Y:Count$Valid Creature.TargetedPlayerCtrl$GreatestCMC
 SVar:Z:Count$Valid Planeswalker.TargetedCtrl$GreatestCMC
diff --git a/forge-gui/res/cardsfolder/upcoming/death_rattle_oni.txt b/forge-gui/res/cardsfolder/upcoming/death_rattle_oni.txt
index 04213f14bdc..202705761cb 100644
--- a/forge-gui/res/cardsfolder/upcoming/death_rattle_oni.txt
+++ b/forge-gui/res/cardsfolder/upcoming/death_rattle_oni.txt
@@ -6,5 +6,5 @@ K:Flash
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {2} less to cast for each creature that died this turn.
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature/Times.2
 T:Mode$ ChangesZone | TriggerZone$ Battlefield | ValidCard$ Card.Self | Origin$ Any  | Destination$ Battlefield | Execute$ DBDestroyAll | TriggerDescription$ CARDNAME enters the battlefield, destroy all other creatures that were dealt damage this turn.
-SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.wasDealtDamageThisTurn+OppCtrl
+SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.wasDealtDamageThisTurn+Other
 Oracle:This spell costs {2} less to cast for each creature that died this turn.\nWhen Death-Rattle Oni enters the battlefield, destroy all other creatures that were dealt damage this turn.
\ No newline at end of file