diff --git a/Mage.Sets/src/mage/cards/k/KuldothaForgemaster.java b/Mage.Sets/src/mage/cards/k/KuldothaForgemaster.java
index 60d08870141..88aadc7c143 100644
--- a/Mage.Sets/src/mage/cards/k/KuldothaForgemaster.java
+++ b/Mage.Sets/src/mage/cards/k/KuldothaForgemaster.java
@@ -12,9 +12,9 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
-import mage.filter.StaticFilters;
 import mage.filter.common.FilterArtifactCard;
 import mage.filter.common.FilterControlledArtifactPermanent;
+import mage.filter.common.FilterControlledPermanent;
 import mage.target.common.TargetCardInLibrary;
 import mage.target.common.TargetControlledPermanent;
 
@@ -24,6 +24,8 @@ import mage.target.common.TargetControlledPermanent;
  */
 public final class KuldothaForgemaster extends CardImpl {
 
+    private static final FilterControlledPermanent filter = new FilterControlledArtifactPermanent("artifacts");
+
     public KuldothaForgemaster(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{5}");
         this.subtype.add(SubType.CONSTRUCT);
@@ -35,7 +37,7 @@ public final class KuldothaForgemaster extends CardImpl {
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterArtifactCard())),
                 new TapSourceCost());
-        ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(3, 3, StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT, false)));
+        ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(3, filter)));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverGeyser.java b/Mage.Sets/src/mage/cards/q/QuicksilverGeyser.java
index 140c40c5308..179edbfc166 100644
--- a/Mage.Sets/src/mage/cards/q/QuicksilverGeyser.java
+++ b/Mage.Sets/src/mage/cards/q/QuicksilverGeyser.java
@@ -6,6 +6,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetNonlandPermanent;
 
 /**
@@ -20,7 +21,7 @@ public final class QuicksilverGeyser extends CardImpl {
 
         // Return up to two target nonland permanents to their owners' hands.
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
-        this.getSpellAbility().addTarget(new TargetNonlandPermanent(0, 2, false));
+        this.getSpellAbility().addTarget(new TargetNonlandPermanent(0, 2, StaticFilters.FILTER_PERMANENTS_NON_LAND, false));
     }
 
     private QuicksilverGeyser(final QuicksilverGeyser card) {