diff --git a/forge-gui/res/cardsfolder/upcoming/staff_of_titania.txt b/forge-gui/res/cardsfolder/upcoming/staff_of_titania.txt
index 543defcb9bf..82b541f372b 100644
--- a/forge-gui/res/cardsfolder/upcoming/staff_of_titania.txt
+++ b/forge-gui/res/cardsfolder/upcoming/staff_of_titania.txt
@@ -1,11 +1,11 @@
 Name:Staff of Titania
 ManaCost:2
 Types:Artifact Equipment
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ X | AddToughness$ X | Description$ Equipped creature gets +X/+X, where X is the number of Forests you control. 
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddSVar$ AE | AddPower$ X | AddToughness$ X | Description$ Equipped creature gets +X/+X, where X is the number of Forests you control. 
 T:Mode$ Attacks | ValidCard$ Creature.EquippedBy | Execute$ TrigToken | TriggerDescription$ Whenever equipped creature attacks, create a 1/1 green Forest Dryad land creature token. (It's affected by summoning sickness.)
 SVar:TrigToken:DB$ Token | TokenScript$ g_1_1_forest_dryad_land
 K:Equip:3
 SVar:HasAttackEffect:TRUE
 SVar:X:Count$TypeYouCtrl.Forest
-DeckHas:Ability$Token Type$Dryad
+DeckHas:Ability$Token & Type$Dryad
 Oracle:Equipped creature gets +X/+X, where X is the number of Forests you control. Whenever equipped creature attacks, create a 1/1 green Forest Dryad land creature token. (It's affected by summoning sickness.)\nEquip {3}
diff --git a/forge-gui/res/cardsfolder/upcoming/the_archimandrite.txt b/forge-gui/res/cardsfolder/upcoming/the_archimandrite.txt
index 43482cf237b..a0c653d6a34 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_archimandrite.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_archimandrite.txt
@@ -4,8 +4,8 @@ Types:Legendary Creature Human Advisor
 PT:0/5
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ At the beginning of your upkeep, you gain X life, where X is the number of cards in your hand minus 4.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ X
-T:Mode$ LifeGained | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigPumpAll| TriggerDescription$ Whenever you gain life, each Advisor, Artificer, and Monk you control gains vigilance and gets +X/+0 until end of turn, where X is the amount of life you gained.
-SVar:TrigPumpAll:DB$ PumpAll |  ValidCards$ Advisor.YouCtrl,Artificer.YouCtrl,Monk.YouCtrl | NumAtt$ +Y | KW$ Vigilance
+T:Mode$ LifeGained | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigPumpAll | TriggerDescription$ Whenever you gain life, each Advisor, Artificer, and Monk you control gains vigilance and gets +X/+0 until end of turn, where X is the amount of life you gained.
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Advisor.YouCtrl,Artificer.YouCtrl,Monk.YouCtrl | NumAtt$ +Y | KW$ Vigilance
 A:AB$ Draw | Cost$ tapXType<3/Advisor.YouCtrl;Monk.YouCtrl;Artificer.YouCtrl/Advisors, Artificers, and/or Monks you control> | SpellDescription$ Draw a card. 
 SVar:X:Count$InYourHand/Minus.4
 SVar:Y:TriggerCount$LifeAmount
diff --git a/forge-gui/res/cardsfolder/upcoming/titania_natures_force.txt b/forge-gui/res/cardsfolder/upcoming/titania_natures_force.txt
index d934d190ec4..994fa77f72d 100644
--- a/forge-gui/res/cardsfolder/upcoming/titania_natures_force.txt
+++ b/forge-gui/res/cardsfolder/upcoming/titania_natures_force.txt
@@ -7,6 +7,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Forest
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_5_3_elemental | TokenOwner$ You
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Elemental.YouCtrl | OptionalDecider$ You | Execute$ TrigMill | TriggerDescription$ Whenever an Elemental you control dies, you may mill three cards.
 SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You
+SVar:BuffedBy:Forest
 DeckHints:Type$Elemental
 DeckHas:Ability$Graveyard|Mill
 Oracle:You may play Forests from your graveyard.\nWhenever a Forest enters the battlefield under your control, create a 5/3 green Elemental creature token.\nWhenever an Elemental you control dies, you may mill three cards.