diff --git a/forge-gui/res/cardsfolder/upcoming/wasteful_harvest.txt b/forge-gui/res/cardsfolder/upcoming/wasteful_harvest.txt
index 4ff27bc300a..d25f5df118a 100644
--- a/forge-gui/res/cardsfolder/upcoming/wasteful_harvest.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wasteful_harvest.txt
@@ -1,8 +1,9 @@
 Name:Wasteful Harvest
 ManaCost:2 G
 Types:Instant
-A:SP$ Mill | NumCards$ 5 | RememberMilled$ True | SubAbility$ DBChangeZone | SpellDescription$ Mill five cards, then return a creature card milled this way to your hand.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Permanent.IsRemembered | ChangeTypeDesc$ permanent cards milled this way | ChangeNum$ 1 | SelectPrompt$ Choose a creature card milled this way | SubAbility$ DBCleanup
+A:SP$ Mill | NumCards$ 5 | RememberMilled$ True | SubAbility$ DBChangeZone | SpellDescription$ Mill five cards. You may put a permanent card from among the cards milled this way into your hand.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Hidden$ True | ChangeType$ Permanent.IsRemembered | ChangeNum$ 1 | SelectPrompt$ Choose a permanent card milled this way | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Mill|Graveyard
+DeckHas:Ability$Mill
+DeckHints:Ability$Graveyard
 Oracle:Mill five cards. You may put a permanent card from among the cards milled this way into your hand. (To mill a card, put the top card of your library into your graveyard.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/yotian_tactician.txt b/forge-gui/res/cardsfolder/upcoming/yotian_tactician.txt
index 270c26ed3cb..3aafa218786 100644
--- a/forge-gui/res/cardsfolder/upcoming/yotian_tactician.txt
+++ b/forge-gui/res/cardsfolder/upcoming/yotian_tactician.txt
@@ -3,5 +3,5 @@ ManaCost:2 W U
 Types:Creature Human Soldier
 PT:3/4
 S:Mode$ Continuous | Affected$ Soldier.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Soldiers you control get +1/+1.
-DeckHints:Type$Soldier
+DeckNeeds:Type$Soldier
 Oracle:Other Soldiers you control get +1/+1.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/zephyr_sentinel.txt b/forge-gui/res/cardsfolder/upcoming/zephyr_sentinel.txt
index 131d1d75d12..aede96581be 100644
--- a/forge-gui/res/cardsfolder/upcoming/zephyr_sentinel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/zephyr_sentinel.txt
@@ -5,9 +5,9 @@ PT:2/1
 K:Flash
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return up to one other target creature you control to its owner's hand. If it was a Soldier, put a +1/+1 counter on CARDNAME.
-SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Creature.YouCtrl+Other | RememberChanged$ True | SubAbility$ DBCounter
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | TgtPrompt$ Choose target creature you control to return to your hand | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | RememberChanged$ True | SubAbility$ DBCounter
 SVar:DBCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | ConditionDefined$ Remembered | ConditionPresent$ Soldier | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Keyword$FirstStrike|Trample & Ability$Counters
+DeckHas:Ability$Counters
 DeckHints:Type$Soldier
 Oracle:Flash\nFlying\nWhen Zephyr Sentinel enters the battlefield, return up to one other target creature you control to its owner's hand. If it was a Soldier, put a +1/+1 counter on Zephyr Sentinel.