diff --git a/Mage.Sets/src/mage/cards/d/DragonTempest.java b/Mage.Sets/src/mage/cards/d/DragonTempest.java
index a0f1f4e80d..e760a1a34e 100644
--- a/Mage.Sets/src/mage/cards/d/DragonTempest.java
+++ b/Mage.Sets/src/mage/cards/d/DragonTempest.java
@@ -46,6 +46,7 @@ import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.common.TargetCreatureOrPlayer;
+import mage.target.targetpointer.FixedTarget;
 
 /**
  *
@@ -60,7 +61,7 @@ public class DragonTempest extends CardImpl {
     }
 
     public DragonTempest(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}");
 
         // Whenever a creature with flying enters the battlefield under your control, it gains haste until the end of turn.
         Effect effect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn);
@@ -119,7 +120,7 @@ class DragonTempestDamageEffect extends OneShotEffect {
         if (controller != null) {
             int amount = game.getBattlefield().countAll(dragonFilter, controller.getId(), game);
             if (amount > 0) {
-                Permanent targetCreature = game.getPermanent(source.getTargets().getFirstTarget());
+                Permanent targetCreature = ((FixedTarget) getTargetPointer()).getTargetedPermanentOrLKIBattlefield(game);
                 if (targetCreature != null) {
                     targetCreature.damage(amount, getTargetPointer().getFirst(game, source), game, false, true);
                 } else {
diff --git a/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java b/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java
index 7b2f75d20c..b57cb5448b 100644
--- a/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java
+++ b/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java
@@ -67,7 +67,8 @@ public class FlameshadowConjuring extends CardImpl {
 
         // Whenever a nontoken creature enters the battlefield under your control, you may pay {R}. If you do, create a token that's a copy of that creature. That token gains haste. Exile it at the beginning of the next end step.
         Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DoIfCostPaid(
-                new FlameshadowConjuringEffect(), new ManaCostsImpl("{R}"), "Pay {R} to create a token that's a copy of that creature that entered the battlefield?"), filterNontoken, false, SetTargetPointer.PERMANENT,
+                new FlameshadowConjuringEffect(), new ManaCostsImpl("{R}"), "Pay {R} to create a token that's a copy of that creature that entered the battlefield?"),
+                filterNontoken, false, SetTargetPointer.PERMANENT,
                 "Whenever a nontoken creature enters the battlefield under your control, "
                 + "you may pay {R}. If you do, create a token that's a copy of that creature. "
                 + "That token gains haste. Exile it at the beginning of the next end step");
@@ -102,7 +103,7 @@ class FlameshadowConjuringEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source));
+        Permanent permanent = ((FixedTarget) getTargetPointer()).getTargetedPermanentOrLKIBattlefield(game);
         if (permanent != null) {
             PutTokenOntoBattlefieldCopyTargetEffect effect = new PutTokenOntoBattlefieldCopyTargetEffect(null, null, true);
             effect.setTargetPointer(getTargetPointer());
diff --git a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java
index 89da932dea..b5748d102e 100644
--- a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java
+++ b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java
@@ -55,6 +55,7 @@ import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.permanent.AnotherPredicate;
 import mage.filter.predicate.permanent.TappedPredicate;
 import mage.filter.predicate.permanent.TokenPredicate;
 import mage.game.Game;
@@ -69,12 +70,13 @@ import mage.target.targetpointer.FixedTarget;
  */
 public class InallaArchmageRitualist extends CardImpl {
 
-    private static final FilterControlledPermanent filter = new FilterControlledPermanent("Wizard");
+    private static final FilterControlledPermanent filter = new FilterControlledPermanent("another nontoken Wizard");
     private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("untapped Wizards you control");
 
     static {
         filter.add(new SubtypePredicate(SubType.WIZARD));
         filter.add(Predicates.not(new TokenPredicate()));
+        filter.add(new AnotherPredicate());
         filter2.add(new SubtypePredicate(SubType.WIZARD));
         filter2.add(Predicates.not(new TappedPredicate()));
     }
@@ -94,7 +96,7 @@ public class InallaArchmageRitualist extends CardImpl {
                         new InallaArchmageRitualistEffect(), new ManaCostsImpl("{1}"), "Pay {1} to create a token copy?"),
                         filter, false, SetTargetPointer.PERMANENT, ""),
                 SourceOnBattlefieldOrCommandZoneCondition.instance,
-                "<i>Eminence</i> - Whenever a nontoken Wizard enters the battlefield under your control, "
+                "<i>Eminence</i> - Whenever another nontoken Wizard enters the battlefield under your control, "
                 + "{this} is in the command zone or on the battlefield, "
                 + "you may pay {1}. If you do, create a token that's a copy of that Wizard. "
                 + "That token gains haste. Exile it at the beginning of the next end step");
@@ -135,7 +137,7 @@ class InallaArchmageRitualistEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source));
+        Permanent permanent = ((FixedTarget) getTargetPointer()).getTargetedPermanentOrLKIBattlefield(game);
         if (permanent != null) {
             PutTokenOntoBattlefieldCopyTargetEffect effect = new PutTokenOntoBattlefieldCopyTargetEffect(null, null, true);
             effect.setTargetPointer(getTargetPointer());