diff --git a/res/cardsfolder/e/elderwood_scion.txt b/res/cardsfolder/e/elderwood_scion.txt
index 8494603c333..21a4a592ba9 100644
--- a/res/cardsfolder/e/elderwood_scion.txt
+++ b/res/cardsfolder/e/elderwood_scion.txt
@@ -7,6 +7,7 @@ K:Trample
 K:Lifelink
 S:Mode$ ReduceCost | ValidTarget$ Card.Self | Activator$ You | Type$ Spell | Amount$ 2 | Description$ Spells you cast that target CARDNAME cost 2 less to cast.
 S:Mode$ RaiseCost | ValidTarget$ Card.Self | Activator$ Opponent | Type$ Spell | Amount$ 2 | Description$ Spells your opponents cast that target CARDNAME cost 2 more to cast.
+SVar:EnchantMe:Multiple
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elderwood_scion.jpg
 SetInfo:PC2|Rare|http://magiccards.info/scans/en/pc2/88.jpg
diff --git a/res/cardsfolder/r/ronom_serpent.txt b/res/cardsfolder/r/ronom_serpent.txt
index 247e53c55fb..39b05771f0e 100644
--- a/res/cardsfolder/r/ronom_serpent.txt
+++ b/res/cardsfolder/r/ronom_serpent.txt
@@ -8,6 +8,7 @@ SVar:X:Count$Valid Land.Snow+YouDontCtrl
 T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Land.Snow+YouCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When you control no snow lands, sacrifice Ronom Serpent.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
 SVar:NeedsToPlay:Land.Snow+YouCtrl
+SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ronom_serpent.jpg
 SetInfo:CSP|Common|http://magiccards.info/scans/en/cs/45.jpg
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
index d76626169bb..17f244cc1b4 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
@@ -561,8 +561,8 @@ public class AbilityFactoryPump {
         // will the creature attack (only relevant for sorcery speed)?
         if (phase.getPhase().isBefore(PhaseType.COMBAT_DECLARE_ATTACKERS)
                 && phase.isPlayerTurn(AllZone.getComputerPlayer())
-                && CardFactoryUtil.doesCreatureAttackAI(c)
-                && attack > 0) {
+                && attack > 0
+                && CardFactoryUtil.doesCreatureAttackAI(c)) {
             return true;
         }
 
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java
index 36b0ebee957..9e2706dd653 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java
@@ -1427,7 +1427,6 @@ public class CardFactoryCreatures {
                 sb.append("any number of creatures with total power 12 or greater.");
                 sacOrSac.setStackDescription(sb.toString());
                 AllZone.getStack().addSimultaneousStackEntry(sacOrSac);
-
             }
         };
 
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
index 4ba07eafc49..fc1c8c6c90d 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
@@ -364,13 +364,8 @@ public class CardFactoryUtil {
      */
     public static boolean doesCreatureAttackAI(final Card card) {
         final List<Card> att = ComputerUtil.getAttackers().getAttackers();
-        for (final Card element : att) {
-            if (element.equals(card)) {
-                return true;
-            }
-        }
 
-        return false;
+        return att.contains(card);
     }
 
     /**