diff --git a/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java b/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java
index b888563904..69b52a0c91 100644
--- a/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java
+++ b/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java
@@ -11,9 +11,9 @@ import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.SubType;
 import mage.constants.Duration;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.StaticFilters;
 import mage.target.TargetPermanent;
@@ -36,7 +36,7 @@ public final class ExoskeletalArmor extends CardImpl {
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
         // Enchanted creature gets +X/+X, where X is the number of creature cards in all graveyards.
-        CardsInAllGraveyardsCount count = new CardsInAllGraveyardsCount(StaticFilters.FILTER_CARD_CREATURE);
+        CardsInAllGraveyardsCount count = new CardsInAllGraveyardsCount(StaticFilters.FILTER_CARD_CREATURES);
         Effect effect = new BoostEnchantedEffect(count, count, Duration.WhileOnBattlefield);
         effect.setText("Enchanted creature gets +X/+X, where X is the number of creature cards in all graveyards");
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java
index cd07e0a9cf..72cd99216c 100644
--- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java
+++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java
@@ -1,4 +1,3 @@
-
 package mage.abilities.dynamicvalue.common;
 
 import java.util.UUID;
@@ -25,7 +24,7 @@ public class CardsInAllGraveyardsCount implements DynamicValue {
         this.filter = filter;
     }
 
-    public CardsInAllGraveyardsCount(CardsInAllGraveyardsCount dynamicValue) {
+    public CardsInAllGraveyardsCount(final CardsInAllGraveyardsCount dynamicValue) {
         this.filter = dynamicValue.filter.copy();
     }
 
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java
index 4901a687ec..8729a75af1 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java
@@ -1,4 +1,3 @@
-
 package mage.abilities.effects.common.continuous;
 
 import mage.abilities.Ability;
diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java
index ac07a4d47a..a09c1f08e8 100644
--- a/Mage/src/main/java/mage/filter/StaticFilters.java
+++ b/Mage/src/main/java/mage/filter/StaticFilters.java
@@ -79,6 +79,12 @@ public final class StaticFilters {
         FILTER_CARD_CREATURE.setLockedFilter(true);
     }
 
+    public static final FilterCreatureCard FILTER_CARD_CREATURES = new FilterCreatureCard("creature cards");
+
+    static {
+        FILTER_CARD_CREATURES.setLockedFilter(true);
+    }
+
     public static final FilterCreatureCard FILTER_CARD_CREATURE_A = new FilterCreatureCard("a creature card");
 
     static {