diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java
index b3f036c501f..1fc55da4b3f 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java
@@ -67,7 +67,7 @@ public class KiraGreatGlassSpinner extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // Creatures you control have "Whenever this creature becomes the target of a spell or ability for the first time in a turn, counter that spell or ability."
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new KiraGreatGlassSpinnerAbility(), Duration.WhileOnBattlefield, new FilterCreaturePermanent())));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new KiraGreatGlassSpinnerAbility(), Duration.WhileOnBattlefield, new FilterCreaturePermanent("Creatures you control"))));
 
     }
 
@@ -86,7 +86,7 @@ public class KiraGreatGlassSpinner extends CardImpl {
 
 class KiraGreatGlassSpinnerAbility extends TriggeredAbilityImpl {
 
-    protected Map<UUID,Integer> turnUsed = new HashMap<UUID,Integer>();
+    protected Map<UUID,Integer> turnUsed = new HashMap<>();
 
     public KiraGreatGlassSpinnerAbility() {
         super(Zone.BATTLEFIELD, new CounterTargetEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/magic2010/Fireball.java b/Mage.Sets/src/mage/sets/magic2010/Fireball.java
index 36bcf3b7836..13d291bc100 100644
--- a/Mage.Sets/src/mage/sets/magic2010/Fireball.java
+++ b/Mage.Sets/src/mage/sets/magic2010/Fireball.java
@@ -141,7 +141,7 @@ class FireballTargetCreatureOrPlayer extends TargetCreatureOrPlayer {
     @Override
     public List<TargetCreatureOrPlayer> getTargetOptions(Ability source, Game game) {
         
-        List<TargetCreatureOrPlayer> options = new ArrayList<TargetCreatureOrPlayer>();
+        List<TargetCreatureOrPlayer> options = new ArrayList<>();
         int xVal = source.getManaCostsToPay().getX();        
 
         if (xVal < 1) {
diff --git a/Mage/src/mage/target/TargetImpl.java b/Mage/src/mage/target/TargetImpl.java
index 0fa8de6a45d..785a8aa538b 100644
--- a/Mage/src/mage/target/TargetImpl.java
+++ b/Mage/src/mage/target/TargetImpl.java
@@ -219,7 +219,7 @@ public abstract class TargetImpl implements Target {
 
     @Override
     public void addTarget(UUID id, Ability source, Game game) {
-        addTarget(id, source, game, false);
+        addTarget(id, source, game, notTarget);
     }
 
     @Override