diff --git a/Mage.Sets/src/mage/sets/KhansOfTarkir.java b/Mage.Sets/src/mage/sets/KhansOfTarkir.java
index 33a7b07a2b..6b436c8213 100644
--- a/Mage.Sets/src/mage/sets/KhansOfTarkir.java
+++ b/Mage.Sets/src/mage/sets/KhansOfTarkir.java
@@ -51,7 +51,7 @@ public class KhansOfTarkir extends ExpansionSet {
         this.hasBoosters = true;
         this.hasBasicLands = true;
         this.numBoosterLands = 1;
-        this.numBoosterCommon = 9;
+        this.numBoosterCommon = 10;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 8;
diff --git a/Mage.Sets/src/mage/sets/darkascension/FaithsShield.java b/Mage.Sets/src/mage/sets/darkascension/FaithsShield.java
index 7a532e197f..6b97634e64 100644
--- a/Mage.Sets/src/mage/sets/darkascension/FaithsShield.java
+++ b/Mage.Sets/src/mage/sets/darkascension/FaithsShield.java
@@ -35,7 +35,6 @@ import mage.abilities.Ability;
 import mage.abilities.condition.common.FatefulHourCondition;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
-import mage.abilities.effects.common.continious.GainAbilityControllerEffect;
 import mage.abilities.effects.common.continious.GainProtectionFromColorTargetEffect;
 import mage.abilities.keyword.ProtectionAbility;
 import mage.cards.CardImpl;
@@ -64,7 +63,6 @@ public class FaithsShield extends CardImpl {
         // Fateful hour - If you have 5 or less life, instead you and each permanent you control gain protection from the color of your choice until end of turn.
         this.getSpellAbility().addEffect(new FaithsShieldEffect());
         this.getSpellAbility().addTarget(new TargetControlledPermanent());
-        this.getSpellAbility().addChoice(new ChoiceColor());        
     }
 
     public FaithsShield(final FaithsShield card) {
@@ -98,12 +96,11 @@ class FaithsShieldEffect extends OneShotEffect {
 
             Ability ability = new ProtectionAbility(filter) ;
             game.addEffect(new GainAbilityControlledEffect(ability, Duration.EndOfTurn), source);
-            game.addEffect(new GainAbilityControllerEffect(ability, Duration.EndOfTurn), source);
         }
         else {
             game.addEffect(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), source);
         }
-        return false;
+        return true;
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/BearsCompanion.java b/Mage.Sets/src/mage/sets/khansoftarkir/BearsCompanion.java
index 4686bc6621..1238e31326 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/BearsCompanion.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/BearsCompanion.java
@@ -28,7 +28,6 @@
 package mage.sets.khansoftarkir;
 
 import java.util.UUID;
-import static javafx.scene.paint.Color.color;
 import mage.MageInt;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/PonybackBrigade.java b/Mage.Sets/src/mage/sets/khansoftarkir/PonybackBrigade.java
index f552719a12..6f98560e7a 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/PonybackBrigade.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/PonybackBrigade.java
@@ -50,7 +50,7 @@ import mage.game.permanent.token.GoblinToken;
 public class PonybackBrigade extends CardImpl {
 
     public PonybackBrigade(UUID ownerId) {
-        super(ownerId, 191, "Ponyback Brigade", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{W}{B}");
+        super(ownerId, 191, "Ponyback Brigade", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{W}{B}");
         this.expansionSetCode = "KTK";
         this.subtype.add("Goblin");
         this.subtype.add("Warrior");
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/FaithsShieldTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/FaithsShieldTest.java
index de3b0b0dd8..a1e9e885f0 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/FaithsShieldTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/FaithsShieldTest.java
@@ -14,6 +14,11 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
  */
 public class FaithsShieldTest extends CardTestPlayerBase {
 
+    /*
+    Target permanent you control gains protection from the color of your choice until end of turn.
+    Fateful hour - If you have 5 or less life, instead you and each permanent you control
+                    gain protection from the color of your choice until end of turn.
+    */
     @Test
     public void testCard() {
         addCard(Zone.BATTLEFIELD, playerA, "White Knight");