diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 3457e94f8cc..12163588c34 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -6201,7 +6201,7 @@ public class Card extends GameEntity implements Comparable<Card> {
             final String[] res = restrictions.split("_");
             final ZoneType destination = ZoneType.smartValueOf(res[0]);
             ZoneType origin = null;
-            if (res[1].equals("from")) {
+            if (res.length > 1 && res[1].equals("from")) {
                 origin = ZoneType.smartValueOf(res[2]);
             }
             List<Card> list = CardUtil.getThisTurnEntered(destination,
@@ -6725,6 +6725,7 @@ public class Card extends GameEntity implements Comparable<Card> {
         } else if (property.startsWith("RememberMap")) {
             System.out.println(source.getRememberMap());
             for (SpellAbility sa : source.getSpellAbilities()) {
+                if (sa.getActivatingPlayer() == null) continue;
                 for (Player p : AbilityUtils.getDefinedPlayers(source, property.split("RememberMap_")[1], sa)) {
                     if (source.getRememberMap().get(p).contains(this)) {
                         return true;
diff --git a/forge-gui/res/cardsfolder/l/lavaball_trap.txt b/forge-gui/res/cardsfolder/l/lavaball_trap.txt
index 391e468ce24..44f6567850a 100644
--- a/forge-gui/res/cardsfolder/l/lavaball_trap.txt
+++ b/forge-gui/res/cardsfolder/l/lavaball_trap.txt
@@ -4,6 +4,6 @@ Types:Instant Trap
 A:SP$Destroy | Cost$ 6 R R | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ DBDamageAll | SpellDescription$ Destroy two target lands. CARDNAME deals 4 damage to each creature.
 A:SP$Destroy | Cost$ 3 R R | CheckSVar$ LandsEntered | SVarCompare$ GE2 | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ DBDamageAll | References$ LandsEntered | SpellDescription$ If an opponent had two or more lands enter the battlefield under his or her control this turn, you may pay {3}{R}{R} rather than pay CARDNAME's mana cost.
 SVar:DBDamageAll:DB$DamageAll | ValidCards$ Creature | NumDmg$ 4 | ValidDescription$ each creature.
-SVar:LandsEntered:Count$ThisTurnEntered_Battlefield_Land.YouDontCtrl
+SVar:LandsEntered:PlayerCountOpponents$HighestValid Card.ThisTurnEntered_Battlefield_Land.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lavaball_trap.jpg
 Oracle:If an opponent had two or more lands enter the battlefield under his or her control this turn, you may pay {3}{R}{R} rather than pay Lavaball Trap's mana cost.\nDestroy two target lands. Lavaball Trap deals 4 damage to each creature.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/r/runeflare_trap.txt b/forge-gui/res/cardsfolder/r/runeflare_trap.txt
index ef06d2158ed..00f383cccdd 100644
--- a/forge-gui/res/cardsfolder/r/runeflare_trap.txt
+++ b/forge-gui/res/cardsfolder/r/runeflare_trap.txt
@@ -4,6 +4,6 @@ Types:Instant Trap
 A:SP$DealDamage | Cost$ R | ValidTgts$ Player | NumDmg$ X | CheckSVar$ Y | SVarCompare$ GE3 | References$ X,Y | SpellDescription$ If an opponent drew three or more cards this turn, you may pay {R} rather than pay CARDNAME's mana cost.
 A:SP$DealDamage | Cost$ 4 R R | ValidTgts$ Player | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals damage to target player equal to the number of cards in that player's hand.
 SVar:X:TargetedPlayer$CardsInHand
-SVar:Y:Count$OppDrewThisTurn
+SVar:Y:PlayerCountOpponents$HighestCardsDrawn
 SVar:Picture:http://www.wizards.com/global/images/magic/general/runeflare_trap.jpg
 Oracle:If an opponent drew three or more cards this turn, you may pay {R} rather than pay Runeflare Trap's mana cost.\nRuneflare Trap deals damage to target player equal to the number of cards in that player's hand.
\ No newline at end of file