diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
index 70f6cd18406..a83a13f4aa4 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
@@ -803,7 +803,7 @@ public class ComputerUtil {
                     }
 
                 }  catch (final Exception ex) {
-                    throw new RuntimeException(String.format("There is an error in the card code for %s:%n", c.getName(), ex.getMessage()), ex);
+                    throw new RuntimeException(String.format("There is an error in the card code for %s:%s", c.getName(), ex.getMessage()), ex);
                 } 
             }
         }
@@ -850,7 +850,7 @@ public class ComputerUtil {
                         }
                     }
                 } catch (final Exception ex) {
-                    throw new RuntimeException(String.format("There is an error in the card code for %s:%n", c.getName(), ex.getMessage()), ex);
+                    throw new RuntimeException(String.format("There is an error in the card code for %s:%s", c.getName(), ex.getMessage()), ex);
                 }
             }
         }
diff --git a/forge-game/src/main/java/forge/game/GameRules.java b/forge-game/src/main/java/forge/game/GameRules.java
index f81d2147b68..7c65e832580 100644
--- a/forge-game/src/main/java/forge/game/GameRules.java
+++ b/forge-game/src/main/java/forge/game/GameRules.java
@@ -52,7 +52,7 @@ public class GameRules {
 
     public void setGamesPerMatch(int gamesPerMatch) {
         this.gamesPerMatch = gamesPerMatch;
-        this.gamesToWinMatch = (int)Math.ceil((gamesPerMatch+1)/2);
+        this.gamesToWinMatch = gamesPerMatch / 2 + 1;
     }
 
     public boolean useAnte() {
diff --git a/forge-game/src/main/java/forge/game/cost/CostTapType.java b/forge-game/src/main/java/forge/game/cost/CostTapType.java
index 127af3e366c..cc0519e170e 100644
--- a/forge-game/src/main/java/forge/game/cost/CostTapType.java
+++ b/forge-game/src/main/java/forge/game/cost/CostTapType.java
@@ -73,7 +73,7 @@ public class CostTapType extends CostPartWithList {
         if (type.contains("sharesCreatureTypeWith")) {
             sb.append("two untapped creatures you control that share a creature type");
         } else if (type.contains("+withTotalPowerGE")) {
-            String num = type.split("+withTotalPowerGE")[1];
+            String num = type.split("\\+withTotalPowerGE")[1];
             sb.append("Tap any number of untapped creatures you control other than CARDNAME with total power " + num + "or greater");
         } else {
             sb.append(Cost.convertAmountTypeToWords(i, this.getAmount(), "untapped " + desc));
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CField.java b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CField.java
index 4ecbd7a4fbb..5a577fd88de 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CField.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CField.java
@@ -21,17 +21,14 @@ import com.google.common.base.Function;
 
 import forge.UiCommand;
 import forge.Singletons;
-import forge.game.Game;
 import forge.game.card.Card;
 import forge.game.player.LobbyPlayer;
 import forge.game.player.Player;
-import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.gui.framework.ICDoc;
 import forge.match.MatchConstants;
 import forge.match.input.Input;
 import forge.match.input.InputPayMana;
-import forge.player.HumanPlay;
 import forge.properties.ForgePreferences;
 import forge.screens.match.ZoneAction;
 import forge.screens.match.views.VField;
diff --git a/forge-gui/src/main/java/forge/quest/BoosterUtils.java b/forge-gui/src/main/java/forge/quest/BoosterUtils.java
index 9af0dace40a..85b8d97db3d 100644
--- a/forge-gui/src/main/java/forge/quest/BoosterUtils.java
+++ b/forge-gui/src/main/java/forge/quest/BoosterUtils.java
@@ -152,7 +152,9 @@ public final class BoosterUtils {
         final ArrayList<PaperCard> result = new ArrayList<PaperCard>();
 
         final int size = allowedColors == null ? 0 : allowedColors.size();
-        Collections.shuffle(allowedColors);
+        if (allowedColors != null) {
+            Collections.shuffle(allowedColors);
+        }
 
         int cntMade = 0, iAttempt = 0;