diff --git a/res/cardsfolder/e/eight_and_a_half_tails_avatar.txt b/res/cardsfolder/e/eight_and_a_half_tails_avatar.txt
index 5ad0a177728..bc50216bca7 100644
--- a/res/cardsfolder/e/eight_and_a_half_tails_avatar.txt
+++ b/res/cardsfolder/e/eight_and_a_half_tails_avatar.txt
@@ -2,7 +2,7 @@ Name:Eight-and-a-Half-Tails Avatar
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:+2/-3
-A:AB$ Pump | Cost$ 1 | ActivationZone$ Command | ValidTgts$ Permanent.YouCtrl | TgtPrompt$ Select target permanent you control | KW$ Protection from red & Protection from blue & Protection from black & Protection from white & Protection from green | RandomKeyword$ True | NoRepetition$ True | SpellDescription$ Until end of turn, target permanent you control gains protection from a color chosen at random from colors it doesn't have protection from.
+A:AB$ Pump | Cost$ 1 | ActivationZone$ Command | ValidTgts$ Permanent.YouCtrl | TgtPrompt$ Select target permanent you control | KW$ Protection from red & Protection from blue & Protection from black & Protection from white & Protection from green | RandomKeyword$ True | NoRepetition$ True | StackDescription$ SpellDescription | SpellDescription$ Until end of turn, target permanent you control gains protection from a color chosen at random from colors it doesn't have protection from.
 SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/eight_and_a_half_tails_avatar.jpg
 Oracle:Hand +2, life -3\n{1}: Until end of turn, target permanent you control gains protection from a color chosen at random from colors it doesn't have protection from.
 SetInfo:VAN Special
\ No newline at end of file
diff --git a/src/main/java/forge/card/ability/effects/PlayEffect.java b/src/main/java/forge/card/ability/effects/PlayEffect.java
index b4e5471ab17..5c401427f06 100644
--- a/src/main/java/forge/card/ability/effects/PlayEffect.java
+++ b/src/main/java/forge/card/ability/effects/PlayEffect.java
@@ -32,7 +32,6 @@ import forge.gui.GuiDialog;
 import forge.item.CardDb;
 import forge.item.CardPrinted;
 import forge.util.Aggregates;
-import forge.util.PredicateString.StringOp;
 
 public class PlayEffect extends SpellAbilityEffect {
     @Override
diff --git a/src/main/java/forge/card/ability/effects/PumpEffect.java b/src/main/java/forge/card/ability/effects/PumpEffect.java
index ee4ec1ec289..66c5b0756b0 100644
--- a/src/main/java/forge/card/ability/effects/PumpEffect.java
+++ b/src/main/java/forge/card/ability/effects/PumpEffect.java
@@ -203,9 +203,9 @@ public class PumpEffect extends SpellAbilityEffect {
             List<String> total = new ArrayList<String>(keywords);
             if (sa.hasParam("NoRepetition")) {
                 final List<String> tgtCardskws = tgtCards.get(0).getKeyword();
-                for (int i = 0; i < tgtCardskws.size(); i++) {
-                    if (total.contains(tgtCardskws.get(i))) {
-                        total.remove(tgtCardskws.get(i));
+                for (String kws : tgtCardskws) {
+                    if (total.contains(kws)) {
+                        total.remove(kws);
                     }
                 }
             }