diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java
index 655fb266033..46ae108b58d 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java
@@ -36,15 +36,11 @@ import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
-import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.effects.ContinuousEffectImpl;
-import mage.abilities.effects.EntersBattlefieldEffect;
-import mage.abilities.effects.OneShotEffect;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.sets.magic2011.ThunderStrike;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
diff --git a/Mage.Sets/src/mage/sets/ravnika/TempleGarden.java b/Mage.Sets/src/mage/sets/ravnika/TempleGarden.java
index c6b165d50fa..93e8bb4ec8d 100644
--- a/Mage.Sets/src/mage/sets/ravnika/TempleGarden.java
+++ b/Mage.Sets/src/mage/sets/ravnika/TempleGarden.java
@@ -30,9 +30,7 @@ package mage.sets.ravnika;
 
 import java.util.UUID;
 import mage.Constants.CardType;
-import mage.Constants.Duration;
 import mage.Constants.Rarity;
-import mage.Constants.Zone;
 import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.costs.common.PayLifeCost;
 import mage.abilities.effects.common.TapSourceUnlessPaysEffect;
diff --git a/Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java b/Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java
index 04597aff3ea..dd450634497 100644
--- a/Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java
+++ b/Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java
@@ -34,7 +34,7 @@ public class PermanentsOnBattlefieldCount implements DynamicValue {
 
     @Override
     public int calculate(Game game, Ability sourceAbility) {
-        return amount * game.getBattlefield().countAll(filter);
+        return amount * game.getBattlefield().count(filter, sourceAbility.getControllerId(), game);
     }
 
     @Override
diff --git a/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java b/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
index d99d667d9e4..79fc231b9b4 100644
--- a/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
+++ b/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
@@ -34,7 +34,6 @@ import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
 import mage.game.stack.Spell;
-import mage.game.stack.StackObject;
 
 /**
  *
diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java
index a747c9fd991..5043bcad608 100644
--- a/Mage/src/mage/game/GameImpl.java
+++ b/Mage/src/mage/game/GameImpl.java
@@ -1120,6 +1120,7 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
 
 	}
 
+    @Override
 	public void setGameOptions(GameOptions options) {
 		this.gameOptions = options;
 	}