diff --git a/forge-ai/src/main/java/forge/ai/ability/AttachAi.java b/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
index 37efeeffec4..ccba8db4412 100644
--- a/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
@@ -1180,7 +1180,7 @@ public class AttachAi extends SpellAbilityAi {
 
         if (keyword.endsWith("CARDNAME can't attack.") || keyword.equals("Defender")
                 || keyword.endsWith("CARDNAME can't attack or block.")) {
-            if (!CombatUtil.canAttackNextTurn(card)) {
+            if (!CombatUtil.canAttackNextTurn(card) || card.getNetCombatDamage() < 1) {
                 return false;
             }
         } else if (keyword.endsWith("CARDNAME attacks each turn if able.")) {
diff --git a/forge-ai/src/main/java/forge/ai/ability/DigAi.java b/forge-ai/src/main/java/forge/ai/ability/DigAi.java
index 01d47658e25..0cca0d2cd4a 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DigAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DigAi.java
@@ -42,6 +42,11 @@ public class DigAi extends SpellAbilityAi {
             return false;
         }
 
+        // return false if nothing to dig into
+        if ("Never".equals(sa.getParam("AILogic"))) {
+            return false;
+        }
+
         // don't deck yourself
         if (sa.hasParam("DestinationZone2") && !"Library".equals(sa.getParam("DestinationZone2"))) {
             int numToDig = AbilityUtils.calculateAmount(host, sa.getParam("DigNum"), sa);
diff --git a/forge-gui/res/cardsfolder/o/orcish_spy.txt b/forge-gui/res/cardsfolder/o/orcish_spy.txt
index 8b2bc05b9b9..a7d4a5521b0 100644
--- a/forge-gui/res/cardsfolder/o/orcish_spy.txt
+++ b/forge-gui/res/cardsfolder/o/orcish_spy.txt
@@ -2,6 +2,6 @@ Name:Orcish Spy
 ManaCost:R
 Types:Creature Orc Rogue
 PT:1/1
-A:AB$ Dig | Cost$ T | ValidTgts$ Player | TgtPrompt$ Select target player | DigNum$ 3 | NoMove$ True | SpellDescription$ Look at the top three cards of target player's library.
+A:AB$ Dig | Cost$ T | ValidTgts$ Player | TgtPrompt$ Select target player | DigNum$ 3 | NoMove$ True | AILogic$ Never | SpellDescription$ Look at the top three cards of target player's library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_spy.jpg
 Oracle:{T}: Look at the top three cards of target player's library.
\ No newline at end of file