diff --git a/Mage.Sets/src/mage/sets/darkascension/BeguilerOfWills.java b/Mage.Sets/src/mage/sets/darkascension/BeguilerOfWills.java
index e97a456459..8521dc482c 100644
--- a/Mage.Sets/src/mage/sets/darkascension/BeguilerOfWills.java
+++ b/Mage.Sets/src/mage/sets/darkascension/BeguilerOfWills.java
@@ -95,11 +95,11 @@ class BeguilerOfWillsTarget extends TargetPermanent {
     @Override
     public boolean canTarget(UUID controllerId, UUID id, Ability source, Game game) {
         Permanent permanent = game.getPermanent(id);
-        int count = game.getBattlefield().countAll(new FilterCreaturePermanent(), source.getControllerId());
+        int count = game.getBattlefield().countAll(this.filter, source.getControllerId());
 
         if (permanent != null && permanent.getPower().getValue() <= count) {
             return super.canTarget(controllerId, id, source, game);
         }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java b/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java
index 7423f59679..2c7a268da2 100644
--- a/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java
+++ b/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java
@@ -38,14 +38,11 @@ import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.ActivatedAbility;
 import mage.abilities.DelayedTriggeredAbility;
-import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.AsThoughEffectImpl;
 import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.CounterUnlessPaysEffect;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.filter.FilterCard;
@@ -53,9 +50,7 @@ import mage.filter.common.FilterCreatureCard;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
-import mage.game.stack.Spell;
 import mage.target.common.TargetCardInGraveyard;
-import mage.target.targetpointer.FixedTarget;
 
 /**
  *
@@ -215,4 +210,4 @@ class HavengulLichEffect extends ContinuousEffectImpl<HavengulLichEffect> {
 		}
 		return false;
 	}
-}
\ No newline at end of file
+}