diff --git a/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java b/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java
index e1e7d419875..fa0a52006a0 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java
@@ -28,17 +28,14 @@
 package mage.sets.gatecrash;
 
 import java.util.UUID;
-import javax.xml.datatype.Duration;
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Mode;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.common.IndestructibleAllEffect;
-import mage.abilities.effects.common.continious.GainAbilityAllEffect;
 import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
 import mage.abilities.keyword.DoubleStrikeAbility;
-import mage.abilities.keyword.IndestructibleAbility;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterControlledPermanent;
 import mage.target.TargetPlayer;
@@ -54,8 +51,8 @@ public class BorosCharm extends CardImpl<BorosCharm> {
         super(ownerId, 148, "Boros Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}{W}");
         this.expansionSetCode = "GTC";
 
-        this.color.setBlue(true);
-        this.color.setGreen(true);
+        this.color.setRed(true);
+        this.color.setWhite(true);
 
         //Choose one - Boros Charm deals 4 damage to target player
         this.getSpellAbility().addEffect(new DamageTargetEffect(4));
diff --git a/Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java b/Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java
index 2525d89046c..901262f2b81 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java
@@ -50,8 +50,8 @@ public class SimicCharm extends CardImpl<SimicCharm> {
         super(ownerId, 195, "Simic Charm", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}{U}");
         this.expansionSetCode = "GTC";
 
+        this.color.setBlack(true);
         this.color.setBlue(true);
-        this.color.setGreen(true);
 
         //Choose one - Target creature gets +3/+3 until end of turn
         this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Constants.Duration.EndOfTurn));
diff --git a/Mage/src/mage/counters/common/KiCounter.java b/Mage/src/mage/counters/common/KiCounter.java
index 129762a39e1..1689ca9dad5 100644
--- a/Mage/src/mage/counters/common/KiCounter.java
+++ b/Mage/src/mage/counters/common/KiCounter.java
@@ -7,7 +7,7 @@ import mage.counters.Counter;
  *
  * @author Loki
  */
-public class KiCounter extends Counter<LevelCounter> {
+public class KiCounter extends Counter<KiCounter> {
 
     public KiCounter() {
         super("Ki");