diff --git a/forge-gui/res/cardsfolder/upcoming/fleshless_gladiator.txt b/forge-gui/res/cardsfolder/upcoming/fleshless_gladiator.txt
index 191602197eb..302f89d8967 100644
--- a/forge-gui/res/cardsfolder/upcoming/fleshless_gladiator.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fleshless_gladiator.txt
@@ -2,7 +2,7 @@ Name:Fleshless Gladiator
 ManaCost:1 B
 Types:Creature Phyrexian Skeleton
 PT:2/2
-A:AB$ ChangeZone | Cost$ 2 B | Defined$ Self | ActivationZone$ Graveyard | Origin$ Graveyard | Destination$ Battlefield | CheckSVar$ X | ConditionSVarCompare$ GE3 | PrecostDesc$ Corrupted - | Tapped$ True | SubAbility$ DBLoseLife | SpellDescription$ Return CARDNAME from your graveyard to the battlefield tapped. You lose 1 life. Activate only if an opponent has three or more poison counters.
+A:AB$ ChangeZone | Cost$ 2 B | Defined$ Self | ActivationZone$ Graveyard | Origin$ Graveyard | Destination$ Battlefield | CheckSVar$ X | SVarCompare$ GE3 | PrecostDesc$ Corrupted - | Tapped$ True | SubAbility$ DBLoseLife | SpellDescription$ Return CARDNAME from your graveyard to the battlefield tapped. You lose 1 life. Activate only if an opponent has three or more poison counters.
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
 SVar:X:PlayerCountOpponents$HighestPoisonCounters
 DeckHas:Ability$Graveyard
diff --git a/forge-gui/res/cardsfolder/upcoming/infectious_bite.txt b/forge-gui/res/cardsfolder/upcoming/infectious_bite.txt
index 34236df27aa..f563ce2a4ab 100644
--- a/forge-gui/res/cardsfolder/upcoming/infectious_bite.txt
+++ b/forge-gui/res/cardsfolder/upcoming/infectious_bite.txt
@@ -1,10 +1,9 @@
 Name:Infectious Bite
 ManaCost:1 G
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature you control | RememberTargets$ True | SubAbility$ DBFight | StackDescription$ Target creature you control [{c:ThisTargetedCard}] | SpellDescription$ Target creature you control deals damage equal to its power to target creature you don't control. Each opponent gets a poison counter.
-SVar:DBFight:DB$ DealDamage| ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Choose target creature you don't control | NumDmg$ X | SubAbility$ DBPoison 
-SVar:DBPoison:DB$ Poison | Defined$ Player.Opponent | Num$ 1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$CardPower
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature you control | SubAbility$ DBFight | StackDescription$ Target creature you control [{c:ThisTargetedCard}] | SpellDescription$ Target creature you control deals damage equal to its power to target creature you don't control. Each opponent gets a poison counter.
+SVar:DBFight:DB$ DealDamage| ValidTgts$ Creature.YouDontCtrl | DamageSource$ ParentTarget | TgtPrompt$ Choose target creature you don't control | NumDmg$ X | SubAbility$ DBPoison 
+SVar:DBPoison:DB$ Poison | Defined$ Player.Opponent | Num$ 1
+SVar:X:ParentTarget$CardPower
 DeckHints:Ability$Proliferate a Keyword$Infect|Toxic
 Oracle:Target creature you control deals damage equal to its power to target creature you don't control. Each opponent gets a poison counter.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/meldweb_curator.txt b/forge-gui/res/cardsfolder/upcoming/meldweb_curator.txt
index 23015ee3de8..f01dacfcedd 100644
--- a/forge-gui/res/cardsfolder/upcoming/meldweb_curator.txt
+++ b/forge-gui/res/cardsfolder/upcoming/meldweb_curator.txt
@@ -3,6 +3,6 @@ ManaCost:3 U
 Types:Creature Phyrexian Wizard
 PT:3/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLibrary | TriggerDescription$ When CARDNAME enters the battlefield, put up to one target instant or sorcery card from your graveyard on top of your library.
-SVar:TrigLibrary:DB$ ChangeZone | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn | TgtZone$ Graveyard | TgtPrompt$ Choose target instant or sorcery card in your graveyard | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0 | Optional$ True
+SVar:TrigLibrary:DB$ ChangeZone | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn | TargetMin$ 0 | TargetMax$ 1 | TgtZone$ Graveyard | TgtPrompt$ Choose target instant or sorcery card in your graveyard | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0
 DeckHas:Ability$Graveyard
 Oracle:When Meldweb Curator enters the battlefield, put up to one target instant or sorcery card from your graveyard on top of your library.
\ No newline at end of file