diff --git a/forge-gui/res/cardsfolder/upcoming/baithook_angler_hook_haunt_drifter.txt b/forge-gui/res/cardsfolder/upcoming/baithook_angler_hook_haunt_drifter.txt
index ee761c99313..a850c9831cb 100644
--- a/forge-gui/res/cardsfolder/upcoming/baithook_angler_hook_haunt_drifter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/baithook_angler_hook_haunt_drifter.txt
@@ -4,6 +4,7 @@ Types:Creature Human Peasant
 PT:2/1
 K:Disturb:1 U
 AlternateMode:DoubleFaced
+DeckHas:Ability$Graveyard
 Oracle:Disturb {1}{U} (You may cast this card from your graveyard transformed for its disturb cost.)
 
 ALTERNATE
diff --git a/forge-gui/res/cardsfolder/upcoming/beloved_beggar_generous_soul.txt b/forge-gui/res/cardsfolder/upcoming/beloved_beggar_generous_soul.txt
index 8119a4e8cab..b3eacb9cd1f 100644
--- a/forge-gui/res/cardsfolder/upcoming/beloved_beggar_generous_soul.txt
+++ b/forge-gui/res/cardsfolder/upcoming/beloved_beggar_generous_soul.txt
@@ -4,6 +4,7 @@ Types:Creature Human Peasant
 PT:0/4
 K:Disturb:4 W W
 AlternateMode:DoubleFaced
+DeckHas:Ability$Graveyard
 Oracle:Disturb {4}{W}{W} (You may cast this card from your graveyard transformed for its disturb cost.)
 
 ALTERNATE
diff --git a/forge-gui/res/cardsfolder/upcoming/covert_cutpurse_covetous_geist.txt b/forge-gui/res/cardsfolder/upcoming/covert_cutpurse_covetous_geist.txt
index f31187ce3bd..d32dcea287c 100644
--- a/forge-gui/res/cardsfolder/upcoming/covert_cutpurse_covetous_geist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/covert_cutpurse_covetous_geist.txt
@@ -6,6 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Creature.YouDontCtrl+wasDealtDamageThisTurn | TgtPrompt$ Select target creature you don't control that was dealt damage this turn
 K:Disturb:4 B
 AlternateMode:DoubleFaced
+DeckHas:Ability$Graveyard
 Oracle:When Covert Cutpurse enters the battlefield, destroy target creature you don't control that was dealt damage this turn.\nDisturb {4}{B} (You may cast this card from your graveyard transformed for its disturb cost.)
 
 ALTERNATE
diff --git a/forge-gui/res/cardsfolder/upcoming/covetous_castaway_ghostly_castigator.txt b/forge-gui/res/cardsfolder/upcoming/covetous_castaway_ghostly_castigator.txt
index 453a787a0e5..3b564673845 100644
--- a/forge-gui/res/cardsfolder/upcoming/covetous_castaway_ghostly_castigator.txt
+++ b/forge-gui/res/cardsfolder/upcoming/covetous_castaway_ghostly_castigator.txt
@@ -6,7 +6,7 @@ K:Disturb:3 U U
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME dies, mill three cards.
 SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You
 AlternateMode:DoubleFaced
-DeckHas:Ability$Mill
+DeckHas:Ability$Mill & Ability$Graveyard
 Oracle:When Covetous Castaway dies, mill three cards.\nDisturb {3}{U}{U} (You may cast this card from your graveyard transformed for its disturb cost.)
 
 ALTERNATE
diff --git a/forge-gui/res/cardsfolder/upcoming/croaking_counterpart.txt b/forge-gui/res/cardsfolder/upcoming/croaking_counterpart.txt
index 15e8f6745c4..f67d2abc1a0 100644
--- a/forge-gui/res/cardsfolder/upcoming/croaking_counterpart.txt
+++ b/forge-gui/res/cardsfolder/upcoming/croaking_counterpart.txt
@@ -3,4 +3,5 @@ ManaCost:1 G U
 Types:Sorcery
 A:SP$ CopyPermanent | ValidTgts$ Creature.nonFrog | TgtPrompt$ Select target non-Frog creature | SetPower$ 1 | SetToughness$ 1 | SetColor$ Green | SetCreatureTypes$ Frog | StackDescription$ Create a token that's a copy of {c:Targeted}, except it's a 1/1 green Frog. | SpellDescription$ Create a token that's a copy of target non-Frog creature, except it's a 1/1 green Frog.
 K:Flashback:3 G U
+DeckHas:Ability$Token & Ability$Graveyard
 Oracle:Create a token that's a copy of target non-Frog creature, except it's a 1/1 green Frog.\nFlashback {3}{G}{U} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/devoted_grafkeeper_departed_soulkeeper.txt b/forge-gui/res/cardsfolder/upcoming/devoted_grafkeeper_departed_soulkeeper.txt
index 5617e0f3a51..c0f6d71278b 100644
--- a/forge-gui/res/cardsfolder/upcoming/devoted_grafkeeper_departed_soulkeeper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/devoted_grafkeeper_departed_soulkeeper.txt
@@ -6,8 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You
 T:Mode$ SpellCast | ValidCard$ Card.wasCastFromGraveyard | ValidActivatingPlayer$ You | Execute$ TrigTap | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a spell from your graveyard, tap target creature you don't control.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control
-DeckHas:Ability$Mill
-DeckHints:Ability$Graveyard
+DeckHas:Ability$Mill & Ability$Graveyard
 K:Disturb:1 W U
 AlternateMode:DoubleFaced
 Oracle:When Devoted Grafkeeper enters the battlefield, mill two cards.\nWhenever you cast a spell from your graveyard, tap target creature you don't control.\nDisturb {1}{W}{U} (You may cast this card from your graveyard transformed for its disturb cost.)