diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_004.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_004.java
index 1908c1481..6c7670796 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_004.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_004.java
@@ -32,14 +32,14 @@ public class Card30_004 extends AbstractEvent {
     @Override
     public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int withTwilightRemoved, int twilightModifier, boolean ignoreRoamingPenalty, boolean ignoreCheckingDeadPile) {
         return super.checkPlayRequirements(playerId, game, self, withTwilightRemoved, twilightModifier, ignoreRoamingPenalty, ignoreCheckingDeadPile)
-                && PlayConditions.canExert(self, game, Race.DWARF);
+                && PlayConditions.canExert(self, game, Race.DWARF, Filters.character);
     }
 
     @Override
     public PlayEventAction getPlayCardAction(final String playerId, LotroGame game, final PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
         final PlayEventAction action = new PlayEventAction(self);
         action.appendCost(
-                new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.DWARF));
+                new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.DWARF, Filters.character));
         action.appendEffect(
                 new ChooseActiveCardsEffect(self, playerId, "Choose Orc(s) to wound", 1, 2, Race.ORC) {
                     @Override
@@ -56,4 +56,4 @@ public class Card30_004 extends AbstractEvent {
         );
         return action;
     }
-}
\ No newline at end of file
+}
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java
index d7e40b099..4046e6d9b 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java
@@ -38,19 +38,20 @@ public class Card31_003 extends AbstractPermanent {
     @Override
     protected List<? extends Action> getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) {
         if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self)) {
-			final ActivateCardAction action = new ActivateCardAction(self);
+	    final ActivateCardAction action = new ActivateCardAction(self);
             action.appendCost(
-					new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.ELF));
-			action.appendEffect(
-					 new ChooseAndHealCharactersEffect(action, playerId, 1, 1, Race.MAN));
-			return Collections.singletonList(action);
-		}
-        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)) {
-			final ActivateCardAction action = new ActivateCardAction(self);
-			action.appendCost(
-					new ChooseAndExertCharactersEffect(action, playerId, 1, 1,  Race.MAN));
-			action.appendCost(
-					new SelfDiscardEffect(self));
+	            new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.ELF));
+	    action.appendEffect(
+	            new ChooseAndHealCharactersEffect(action, playerId, 1, 1, Race.MAN));
+	    return Collections.singletonList(action);
+	}
+        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)
+	        && PlayConditions.canExert(self, game, Race.MAN)) {
+	    final ActivateCardAction action = new ActivateCardAction(self);
+	    action.appendCost(
+	        new ChooseAndExertCharactersEffect(action, playerId, 1, 1,  Race.MAN));
+	    action.appendCost(
+	        new SelfDiscardEffect(self));
             List<Effect> possibleEffects = new LinkedList<Effect>();
             possibleEffects.add(
                     new ChooseAndPlayCardFromDeckEffect(playerId, Race.ELF) {
@@ -70,8 +71,8 @@ public class Card31_003 extends AbstractPermanent {
             }
             action.appendEffect(
                     new ChoiceEffect(action, playerId, possibleEffects));
-			return Collections.singletonList(action);
+	    return Collections.singletonList(action);
         }
 	return null;
     }
-}
\ No newline at end of file
+}
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gollum/Card31_021.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gollum/Card31_021.java
index b9e492038..c0f69d685 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gollum/Card31_021.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gollum/Card31_021.java
@@ -27,14 +27,14 @@ import java.util.List;
  * Set: The Short Rest
  * Side: Shadow
  * Culture: Gollum
- * Twilight Cost: 1
+ * Twilight Cost: 2
  * Type: Event • Skirmish
  * Game Text: You may exert Gollum twice to play this event from your discard pile. Make a minion strength +2. If
  * that minion wins this skirmish, you may add a doubt.
  */
 public class Card31_021 extends AbstractEvent {
     public Card31_021() {
-        super(Side.SHADOW, 1, Culture.GOLLUM, "If He Loses", Phase.SKIRMISH);
+        super(Side.SHADOW, 2, Culture.GOLLUM, "If He Loses", Phase.SKIRMISH);
     }
 
     @Override