diff --git a/Mage.Sets/src/mage/cards/c/CallerOfTheHunt.java b/Mage.Sets/src/mage/cards/c/CallerOfTheHunt.java
index 11f1193e2c3..02dacbe4611 100644
--- a/Mage.Sets/src/mage/cards/c/CallerOfTheHunt.java
+++ b/Mage.Sets/src/mage/cards/c/CallerOfTheHunt.java
@@ -28,8 +28,6 @@ import mage.target.targetpointer.FixedTarget;
  */
 public final class CallerOfTheHunt extends CardImpl {
 
-    FilterCreaturePermanent filter = new FilterCreaturePermanent();
-
     public CallerOfTheHunt(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}");
 
@@ -72,10 +70,10 @@ enum CallerOfTheHuntAdjuster implements CostAdjuster {
                 ContinuousEffect effectPowerToughness = new SetPowerToughnessSourceEffect(
                         new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame);
                 effectPowerToughness.setText("");
-                SimpleStaticAbility sa = new SimpleStaticAbility(Zone.ALL, effectPowerToughness);
-                GainAbilityTargetEffect effectTest = new GainAbilityTargetEffect(sa, Duration.EndOfGame);
-                effectTest.setTargetPointer(new FixedTarget(ability.getSourceId()));
-                game.getState().addEffect(effectTest, ability);
+                SimpleStaticAbility setPT = new SimpleStaticAbility(Zone.ALL, effectPowerToughness);
+                GainAbilityTargetEffect gainAbility = new GainAbilityTargetEffect(setPT, Duration.EndOfGame);
+                gainAbility.setTargetPointer(new FixedTarget(ability.getSourceId()));
+                game.getState().addEffect(gainAbility, ability);
             }
         }
     }
diff --git a/Mage.Sets/src/mage/cards/t/TezzeretMasterOfTheBridge.java b/Mage.Sets/src/mage/cards/t/TezzeretMasterOfTheBridge.java
index 5171330f063..c89cdad2b53 100644
--- a/Mage.Sets/src/mage/cards/t/TezzeretMasterOfTheBridge.java
+++ b/Mage.Sets/src/mage/cards/t/TezzeretMasterOfTheBridge.java
@@ -48,7 +48,7 @@ public final class TezzeretMasterOfTheBridge extends CardImpl {
         this.addAbility(new PlaneswalkerEntersWithLoyaltyCountersAbility(5));
 
         // Creature and planeswalker spells you cast have affinity for artifacts.
-        this.addAbility(new SimpleStaticAbility(new GainAbilityControlledSpellsEffect(
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledSpellsEffect(
                 new AffinityForArtifactsAbility(), filter
         )));
 
diff --git a/Mage/src/main/java/mage/abilities/effects/common/AffinityEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AffinityEffect.java
index 48f2973a40e..a11f5967fb7 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/AffinityEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/AffinityEffect.java
@@ -30,7 +30,8 @@ public class AffinityEffect extends CostModificationEffectImpl {
         SpellAbility spellAbility = (SpellAbility)abilityToModify;
         Mana mana = spellAbility.getManaCostsToPay().getMana();
         if (mana.getGeneric() > 0) {
-            int count = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game);
+            //int count = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game); // this doesn't work with Sen Triplets
+            int count = game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game).size(); // this works with Sen Triplets
             int newCount = mana.getGeneric() - count;
             if (newCount < 0) {
                 newCount = 0;
diff --git a/Mage/src/main/java/mage/abilities/keyword/AffinityForArtifactsAbility.java b/Mage/src/main/java/mage/abilities/keyword/AffinityForArtifactsAbility.java
index cb7991935c6..26cecb80a6b 100644
--- a/Mage/src/main/java/mage/abilities/keyword/AffinityForArtifactsAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/AffinityForArtifactsAbility.java
@@ -29,6 +29,6 @@ public class AffinityForArtifactsAbility extends SimpleStaticAbility {
 
     @Override
     public String getRule() {
-        return "affinity for artifacts <i>(This spell costs {1} less to cast for each artifact you control.)</i>";
+        return "Affinity for artifacts <i>(This spell costs {1} less to cast for each artifact you control.)</i>";
     }
 }