diff --git a/forge-game/src/main/java/forge/game/ability/effects/ReplaceEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ReplaceEffect.java
index 6c520627f03..b8e31c83453 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ReplaceEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ReplaceEffect.java
@@ -37,6 +37,7 @@ public class ReplaceEffect extends SpellAbilityEffect {
             }
             // effect was updated
             originalParams.put("ReplacementResult", ReplacementResult.Updated);
+            break;
         }
         default:
             // effect was replaced with something else
diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
index 3ccc727c005..a41043ce649 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -410,6 +410,7 @@ public class Player extends GameEntity implements Comparable<Player> {
             } else {
                 return false;
             }
+            break;
         default:       
             return false;
         }
diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java b/forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java
index 21df872c2b3..9c8438eeddf 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java
@@ -43,7 +43,7 @@ public class ReplaceGainLife extends ReplacementEffect {
      */
     @Override
     public boolean canReplace(Map<String, Object> runParams) {
-        if (!runParams.get("Event").equals("GainLife") && (int)runParams.get("LifeGained") <= 0) {
+        if (!runParams.get("Event").equals("GainLife") || ((int)runParams.get("LifeGained")) <= 0) {
             return false;
         }
         if (this.getMapParams().containsKey("ValidPlayer")) {