diff --git a/Mage.Sets/src/mage/sets/dissension/HallowedFountain.java b/Mage.Sets/src/mage/sets/dissension/HallowedFountain.java
index 24bbf1ea74e..d432f113221 100644
--- a/Mage.Sets/src/mage/sets/dissension/HallowedFountain.java
+++ b/Mage.Sets/src/mage/sets/dissension/HallowedFountain.java
@@ -29,14 +29,14 @@
 package mage.sets.dissension;
 
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Rarity;
 import mage.abilities.common.AsEntersBattlefieldAbility;
 import mage.abilities.costs.common.PayLifeCost;
 import mage.abilities.effects.common.TapSourceUnlessPaysEffect;
 import mage.abilities.mana.BlueManaAbility;
 import mage.abilities.mana.WhiteManaAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
 
 /**
  *
diff --git a/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java b/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java
index 23503ce098f..d45f67214b3 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java
@@ -28,12 +28,6 @@
 package mage.sets.gatecrash;
 
 import java.util.UUID;
-import mage.constants.AsThoughEffectType;
-import mage.constants.CardType;
-import mage.constants.Duration;
-import mage.constants.Outcome;
-import mage.constants.Rarity;
-import mage.constants.Zone;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility;
@@ -43,9 +37,16 @@ import mage.abilities.effects.OneShotEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.Card;
 import mage.cards.CardImpl;
+import mage.constants.AsThoughEffectType;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 import mage.game.ExileZone;
 import mage.game.Game;
 import mage.players.Player;
+import mage.util.CardUtil;
 
 /**
 * FAQ
@@ -111,12 +112,7 @@ class NightveilSpecterExileEffect extends OneShotEffect<NightveilSpecterExileEff
           Card card = player.getLibrary().removeFromTop(game);
           Card sourceCard = game.getCard(source.getSourceId());
           if (card != null && sourceCard != null) {
-              UUID exileId = (UUID) game.getState().getValue(new StringBuilder("exileZone").append(source.getSourceId()).append(sourceCard.getZoneChangeCounter()).toString());
-              if (exileId == null) {
-                  exileId = UUID.randomUUID();
-                  game.getState().setValue(new StringBuilder("exileZone").append(source.getSourceId()).append(sourceCard.getZoneChangeCounter()).toString(), exileId);
-              }
-              return card.moveToExile(exileId, sourceCard.getName(), source.getSourceId(), game);
+              return card.moveToExile(CardUtil.getCardExileZoneId(game, source), sourceCard.getName(), source.getSourceId(), game);
           }
       }
       return false;
@@ -153,14 +149,21 @@ class NightveilSpecterEffect extends AsThoughEffectImpl<NightveilSpecterEffect>
     @Override
     public boolean applies(UUID sourceId, Ability source, Game game) {
       Card card = game.getCard(sourceId);
-      if (card != null && game.getState().getZone(card.getId()) == Zone.EXILED) {
-          Card sourceCard = game.getCard(source.getSourceId());
-          UUID exileId = (UUID) game.getState().getValue(new StringBuilder("exileZone").append(source.getSourceId()).append(sourceCard.getZoneChangeCounter()).toString());
-          ExileZone zone = game.getExile().getExileZone(exileId);
+      Player controller = game.getPlayer(source.getControllerId());
+      if (controller != null && card != null && game.getState().getZone(card.getId()) == Zone.EXILED) {
+          ExileZone zone = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, source));
           if (zone != null && zone.contains(card.getId())) {
-                if (card.getCardType().contains(CardType.INSTANT) || game.canPlaySorcery(source.getControllerId())) {
-                    card.setControllerId(source.getControllerId());
-                    return true;
+                if (card.getCardType().contains(CardType.LAND)) {
+                    // If the revealed card is a land, you can play it only if it's your turn and you haven't yet played a land this turn.
+                    if (game.getActivePlayerId().equals(source.getControllerId()) && controller.canPlayLand()) {
+                        card.setControllerId(source.getControllerId());
+                        return true;
+                    }
+                } else {
+                    if (card.getSpellAbility().spellCanBeActivatedRegularlyNow(source.getControllerId(), game)) {
+                        card.setControllerId(source.getControllerId());
+                        return true;
+                    }
                 }
           }
       }
diff --git a/Mage/src/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java b/Mage/src/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java
index b99cf2b3cf8..14170da3b96 100644
--- a/Mage/src/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java
+++ b/Mage/src/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java
@@ -28,10 +28,10 @@
 
 package mage.abilities.effects.common;
 
-import mage.constants.Outcome;
 import mage.abilities.Ability;
 import mage.abilities.costs.Cost;
 import mage.abilities.effects.OneShotEffect;
+import mage.constants.Outcome;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -62,8 +62,9 @@ public class TapSourceUnlessPaysEffect extends OneShotEffect<TapSourceUnlessPays
             if (cost.canPay(source.getSourceId(), source.getControllerId(), game)
                     && player.chooseUse(Outcome.Benefit, cost.getText() + " or " + permanent.getName() + " comes into play tapped?", game)) {
                 cost.clearPaid();
-                if (cost.pay(source, game, source.getId(), source.getControllerId(), false))
+                if (cost.pay(source, game, source.getSourceId(), source.getControllerId(), false)) {
                     return true;
+                }
             }
             permanent.tap(game);
             return true;