diff --git a/Mage.Sets/src/mage/cards/d/DeepForestHermit.java b/Mage.Sets/src/mage/cards/d/DeepForestHermit.java
index 3ebef4d297..135c23cfcd 100644
--- a/Mage.Sets/src/mage/cards/d/DeepForestHermit.java
+++ b/Mage.Sets/src/mage/cards/d/DeepForestHermit.java
@@ -1,10 +1,13 @@
 package mage.cards.d;
 
 import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.continuous.BoostControlledEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.keyword.VanishingSacrificeAbility;
 import mage.abilities.keyword.VanishingUpkeepAbility;
 import mage.cards.CardImpl;
@@ -12,6 +15,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.SubType;
+import mage.counters.CounterType;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.game.permanent.token.SquirrelToken;
 
@@ -34,6 +38,9 @@ public final class DeepForestHermit extends CardImpl {
         this.toughness = new MageInt(1);
 
         // Vanishing 3
+        Ability ability = new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.TIME.createInstance(3)));
+        ability.setRuleVisible(false);
+        this.addAbility(ability);
         this.addAbility(new VanishingUpkeepAbility(3));
         this.addAbility(new VanishingSacrificeAbility());
 
diff --git a/Mage.Sets/src/mage/cards/m/MartyrsSoul.java b/Mage.Sets/src/mage/cards/m/MartyrsSoul.java
index 2849f23d23..ff3dddc184 100644
--- a/Mage.Sets/src/mage/cards/m/MartyrsSoul.java
+++ b/Mage.Sets/src/mage/cards/m/MartyrsSoul.java
@@ -13,7 +13,8 @@ import mage.constants.CardType;
 import mage.constants.ComparisonType;
 import mage.constants.SubType;
 import mage.counters.CounterType;
-import mage.filter.common.FilterLandPermanent;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterControlledLandPermanent;
 import mage.filter.predicate.permanent.TappedPredicate;
 
 import java.util.UUID;
@@ -23,7 +24,7 @@ import java.util.UUID;
  */
 public final class MartyrsSoul extends CardImpl {
 
-    private static final FilterLandPermanent filter = new FilterLandPermanent();
+    private static final FilterPermanent filter = new FilterControlledLandPermanent();
 
     static {
         filter.add(TappedPredicate.instance);
diff --git a/Mage.Sets/src/mage/cards/s/SmokeShroud.java b/Mage.Sets/src/mage/cards/s/SmokeShroud.java
index f3b73a252a..7e899b610e 100644
--- a/Mage.Sets/src/mage/cards/s/SmokeShroud.java
+++ b/Mage.Sets/src/mage/cards/s/SmokeShroud.java
@@ -50,9 +50,9 @@ public final class SmokeShroud extends CardImpl {
 
         // When a Ninja enters the battlefield under your control, you may return Smoke Shroud from your graveyard to the battlefield attached to that creature.
         this.addAbility(new EntersBattlefieldControlledTriggeredAbility(
-                Zone.GRAVEYARD, new SmokeShroudEffect(), filter,
-                true, "When a Ninja enters the battlefield under your control," +
-                " you may return {this} from your graveyard to the battlefield attached to that creature."
+                Zone.GRAVEYARD, new SmokeShroudEffect(), filter, true,
+                SetTargetPointer.PERMANENT, "When a Ninja enters the battlefield under your control, " +
+                "you may return {this} from your graveyard to the battlefield attached to that creature."
         ));
     }
 
diff --git a/Mage.Sets/src/mage/cards/w/WatcherForTomorrow.java b/Mage.Sets/src/mage/cards/w/WatcherForTomorrow.java
index 9a1904b202..fed14663f5 100644
--- a/Mage.Sets/src/mage/cards/w/WatcherForTomorrow.java
+++ b/Mage.Sets/src/mage/cards/w/WatcherForTomorrow.java
@@ -72,7 +72,7 @@ class WatcherForTomorrowEffect extends OneShotEffect {
         if (player == null) {
             return false;
         }
-        ExileZone zone = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, source));
+        ExileZone zone = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, source.getSourceId(), true));
         if (zone == null) {
             return false;
         }