diff --git a/forge-gui/res/cardsfolder/upcoming/kodis_emberclaw_familiar.txt b/forge-gui/res/cardsfolder/upcoming/kodis_emberclaw_familiar.txt
index 1db7d930814..d813b74c320 100644
--- a/forge-gui/res/cardsfolder/upcoming/kodis_emberclaw_familiar.txt
+++ b/forge-gui/res/cardsfolder/upcoming/kodis_emberclaw_familiar.txt
@@ -7,5 +7,5 @@ SVar:TrigSlug:DB$ DamageAll | ValidPlayers$ OppNonTriggeredTarget | NumDmg$ X |
 SVar:X:TriggerCount$DamageAmount
 K:Partner
 SVar:BuffedBy:Card.IsCommander
-AI:RemoveDeck:Random
+AI:RemoveDeck:NonCommander
 Oracle:Whenever a commander you control deals combat damage to an opponent, it deals that much damage to each other opponent.\nPartner (You can have two commanders if they both have partner.)
diff --git a/forge-gui/res/cardsfolder/upcoming/seraphic_greatsword.txt b/forge-gui/res/cardsfolder/upcoming/seraphic_greatsword.txt
index 85747d22b5f..ddd96460f34 100755
--- a/forge-gui/res/cardsfolder/upcoming/seraphic_greatsword.txt
+++ b/forge-gui/res/cardsfolder/upcoming/seraphic_greatsword.txt
@@ -6,4 +6,5 @@ T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Attacked$ Player.withMostLife | E
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_4_4_angel_flying | TokenOwner$ You | TokenTapped$ True | TokenAttacking$ True
 SVar:HasAttackEffect:TRUE
 K:Equip:4
+DeckHas:Ability$Token
 Oracle:Equipped creature gets +2/+2.\nWhenever equipped creature attacks the player with the most life or tied for most life, create a 4/4 white Angel creature token with flying that's tapped and attacking that player.\nEquip {4}