diff --git a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
index ecd71bf4607..a9ae2fa758f 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
@@ -42,8 +42,7 @@ public class RestartGameEffect extends SpellAbilityEffect {
             CardCollection newLibrary = new CardCollection(p.getCardsIn(restartZones, false));
             List<Card> filteredCards = null;
             if (leaveZone != null) {
-                filteredCards = CardLists.filter(p.getCardsIn(leaveZone),
-                        CardPredicates.restriction(leaveRestriction.split(","), p, sa.getHostCard(), null));
+                filteredCards = CardLists.getValidCards(p.getCardsIn(leaveZone), leaveRestriction.split(","), p, sa.getHostCard(), null);
                 newLibrary.addAll(filteredCards);
             }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java
index 8533cae74c6..e2623c7806b 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java
@@ -55,6 +55,7 @@ public class TriggerCounterRemoved extends Trigger {
      * @param runParams*/
     @Override
     public final boolean performTest(final Map<AbilityKey, Object> runParams) {
+        final Card addedTo = (Card) runParams.get(AbilityKey.Card);
         final CounterType addedType = (CounterType) runParams.get(AbilityKey.CounterType);
         final Integer addedNewCounterAmount = (Integer) runParams.get(AbilityKey.NewCounterAmount);
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java
index 90b466c266b..5df7ba0c723 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java
@@ -55,6 +55,7 @@ public class TriggerCounterRemovedOnce extends Trigger {
      * @param runParams*/
     @Override
     public final boolean performTest(final Map<AbilityKey, Object> runParams) {
+        final Card removedFrom = (Card) runParams.get(AbilityKey.Card);
         final CounterType removedType = (CounterType) runParams.get(AbilityKey.CounterType);
 
         if (hasParam("ValidCard")) {
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTokenCreated.java b/forge-game/src/main/java/forge/game/trigger/TriggerTokenCreated.java
index 214144b26b0..49628163635 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerTokenCreated.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerTokenCreated.java
@@ -67,9 +67,8 @@ public class TriggerTokenCreated extends Trigger {
      * @param runParams*/
     @Override
     public final boolean performTest(final Map<AbilityKey, Object> runParams) {
-        Player p = (Player) runParams.get(AbilityKey.Player);
         if (hasParam("ValidPlayer")) {
-            if (!matchesValid(p, getParam("ValidPlayer").split(","), getHostCard())) {
+            if (!matchesValid(runParams.get(AbilityKey.Player), getParam("ValidPlayer").split(","), getHostCard())) {
                 return false;
             }
         }