diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/NahirisWrath.java b/Mage.Sets/src/mage/sets/eldritchmoon/NahirisWrath.java
index 259352bd21b..edd69182152 100644
--- a/Mage.Sets/src/mage/sets/eldritchmoon/NahirisWrath.java
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/NahirisWrath.java
@@ -117,7 +117,7 @@ class NahirisWrathAdditionalCost extends VariableCostImpl {
 
     @Override
     public Cost getFixedCostsFromAnnouncedValue(int xValue) {
-        TargetCardInHand target = new TargetCardInHand(xValue, new FilterCard());
+        TargetCardInHand target = new TargetCardInHand(xValue, new FilterCard("cards to discard"));
         return new DiscardTargetCost(target);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/ShredsOfSanity.java b/Mage.Sets/src/mage/sets/eldritchmoon/ShredsOfSanity.java
index 48cb179042b..f26efa83929 100644
--- a/Mage.Sets/src/mage/sets/eldritchmoon/ShredsOfSanity.java
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/ShredsOfSanity.java
@@ -51,8 +51,8 @@ import mage.target.TargetCard;
  */
 public class ShredsOfSanity extends CardImpl {
 
-    private final static FilterCard filterInstant = new FilterCard();
-    private final static FilterCard filterSorcery = new FilterCard();
+    private final static FilterCard filterInstant = new FilterCard("an instant card in your graveyard");
+    private final static FilterCard filterSorcery = new FilterCard("a sorcery card in your graveyard");
 
     static {
         filterInstant.add(new CardTypePredicate(CardType.INSTANT));
diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java
index 6309f6776f1..0b51372789d 100644
--- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java
+++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java
@@ -2,7 +2,7 @@ package mage.abilities.dynamicvalue.common;
 
 import mage.abilities.Ability;
 import mage.abilities.costs.Cost;
-import mage.abilities.costs.common.DiscardCardCost;
+import mage.abilities.costs.common.DiscardTargetCost;
 import mage.abilities.dynamicvalue.DynamicValue;
 import mage.abilities.effects.Effect;
 import mage.cards.Card;
@@ -16,8 +16,8 @@ public class DiscardCostCardConvertedMana implements DynamicValue {
     @Override
     public int calculate(Game game, Ability sourceAbility, Effect effect) {
         for (Cost cost : sourceAbility.getCosts()) {
-            if (cost instanceof DiscardCardCost) {
-                DiscardCardCost discardCost = (DiscardCardCost) cost;
+            if (cost instanceof DiscardTargetCost) {
+                DiscardTargetCost discardCost = (DiscardTargetCost) cost;
                 int cmc = 0;
                 for (Card card : discardCost.getCards()) {
                     cmc += card.getConvertedManaCost();