diff --git a/Mage.Sets/src/mage/sets/fatereforged/AtarkaWorldRender.java b/Mage.Sets/src/mage/sets/fatereforged/AtarkaWorldRender.java
index afa4b698a5..1ea9308089 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/AtarkaWorldRender.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/AtarkaWorldRender.java
@@ -109,7 +109,7 @@ class AtarkaWorldRenderEffect extends TriggeredAbilityImpl {
         if (event.getType() == EventType.ATTACKER_DECLARED) {
             Permanent attacker = game.getPermanent(event.getSourceId());
             if (attacker != null
-                    && filter.match(attacker, game)) {
+                    && filter.match(attacker, sourceId, controllerId, game)) {
                 for (Effect effect : this.getEffects()) {
                     effect.setTargetPointer(new FixedTarget(attacker.getId()));
                 }
diff --git a/Mage.Sets/src/mage/sets/fatereforged/MonasteryMentor.java b/Mage.Sets/src/mage/sets/fatereforged/MonasteryMentor.java
index af9b3ca8f4..e30f0ac876 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/MonasteryMentor.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/MonasteryMentor.java
@@ -79,7 +79,7 @@ public class MonasteryMentor extends CardImpl {
     MonasteryMentorToken() {
         super("Monk", "1/1 white Monk creature token with prowess");
         cardType.add(CardType.CREATURE);
-        color.setBlack(true);
+        color.setWhite(true);
         subtype.add("Monk");
         power = new MageInt(1);
         toughness = new MageInt(1);
diff --git a/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java b/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java
index c31b5c9cd4..e638d5ec91 100644
--- a/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java
+++ b/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java
@@ -46,6 +46,7 @@ import mage.constants.Rarity;
 import mage.constants.TargetController;
 import mage.constants.Zone;
 import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.filter.predicate.permanent.AnotherPredicate;
 import mage.filter.predicate.permanent.AttackingPredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
@@ -63,9 +64,11 @@ public class GoblinRabblemaster extends CardImpl {
     static {
         otherGoblinFilter.add(new AnotherPredicate());
         otherGoblinFilter.add(new ControllerPredicate(TargetController.YOU));
+        otherGoblinFilter.add(new SubtypePredicate("Goblin"));
         
         attackingFilter.add(new AttackingPredicate());
         attackingFilter.add(new AnotherPredicate());
+        attackingFilter.add(new SubtypePredicate("Goblin"));
     }
     
     public GoblinRabblemaster(UUID ownerId) {
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DinOfTheFireherd.java b/Mage.Sets/src/mage/sets/shadowmoor/DinOfTheFireherd.java
index b2087ddf0d..0600bd8dd1 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/DinOfTheFireherd.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/DinOfTheFireherd.java
@@ -113,7 +113,7 @@ class DinOfTheFireherdEffect extends OneShotEffect {
             effect.apply(game, source);
             
             Effect effect2 = new SacrificeEffect(new FilterControlledLandPermanent(), redCreaturesControllerControls, "Target Opponent");
-            effect.setTargetPointer(new FixedTarget(targetOpponent.getId()));
+            effect2.setTargetPointer(new FixedTarget(targetOpponent.getId()));
             effect2.apply(game, source);
             applied = true;
         }