diff --git a/Mage.Sets/src/mage/sets/darkascension/Gravecrawler.java b/Mage.Sets/src/mage/sets/darkascension/Gravecrawler.java
index 565dc956b1b..2a033f89f19 100644
--- a/Mage.Sets/src/mage/sets/darkascension/Gravecrawler.java
+++ b/Mage.Sets/src/mage/sets/darkascension/Gravecrawler.java
@@ -108,7 +108,7 @@ class GravecrawlerPlayEffect extends AsThoughEffectImpl<GravecrawlerPlayEffect>
     public boolean applies(UUID sourceId, Ability source, Game game) {
         if (sourceId.equals(source.getSourceId())) {
             Card card = game.getCard(source.getSourceId());
-            if (card != null && game.getState().getZone(source.getSourceId()) == Constants.Zone.GRAVEYARD) {
+            if (card != null && game.getState().getZone(source.getSourceId()) == Constants.Zone.GRAVEYARD && game.canPlaySorcery(source.getControllerId())) {
                 if (game.getBattlefield().countAll(filter, source.getControllerId(), game) > 0)
                     return true;
             }
diff --git a/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java b/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java
index 6c88a4bab5d..a44c5d736c5 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java
@@ -31,20 +31,13 @@ import java.util.UUID;
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
-import mage.ObjectColor;
 import mage.abilities.Ability;
 import mage.abilities.StateTriggeredAbility;
-import mage.abilities.common.EntersBattlefieldTriggeredAbility;
-import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.condition.common.PermanentHasCounterCondition;
-import mage.abilities.condition.common.PermanentHasCounterCondition.CountType;
+import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
-import mage.abilities.decorator.ConditionalOneShotEffect;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.SacrificeSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.mana.AnyColorManaAbility;
-import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
 import mage.filter.FilterPermanent;
@@ -71,7 +64,7 @@ public class GemstoneMine extends CardImpl<GemstoneMine> {
         this.expansionSetCode = "TSB";
 
         // Gemstone Mine enters the battlefield with three mining counters on it.
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.MINING.createInstance(3))));
+        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.MINING.createInstance(3))));
 
         // {tap}, Remove a mining counter from Gemstone Mine: Add one mana of any color to your mana pool. If there are no mining counters on Gemstone Mine, sacrifice it.
         Ability ability = new AnyColorManaAbility();