diff --git a/Mage.Server/src/main/java/mage/server/User.java b/Mage.Server/src/main/java/mage/server/User.java
index ec940a2d2b2f..5bbe4991be17 100644
--- a/Mage.Server/src/main/java/mage/server/User.java
+++ b/Mage.Server/src/main/java/mage/server/User.java
@@ -329,7 +329,6 @@ public boolean isExpired(Date expired) {
 
     private void reconnect() {
         logger.trace(userName + " started reconnect");
-        //lastActivity = new Date(); // ??? comment to test can't reconnect to game on disconnect
         for (Entry<UUID, Table> entry : tables.entrySet()) {
             ccJoinedTable(entry.getValue().getRoomId(), entry.getValue().getId(), entry.getValue().isTournament());
         }
diff --git a/Mage.Sets/src/mage/cards/o/OathOfMages.java b/Mage.Sets/src/mage/cards/o/OathOfMages.java
index 73ce58c6f36d..688ee7aaaf4c 100644
--- a/Mage.Sets/src/mage/cards/o/OathOfMages.java
+++ b/Mage.Sets/src/mage/cards/o/OathOfMages.java
@@ -110,7 +110,7 @@ public boolean apply(Game game, Ability source) {
         if (sourceObject == null || firstPlayer == null) {
             return false;
         }
-        if (firstPlayer.chooseUse(outcome, "Deal one damage to " + secondPlayer.getLogName() + "?", source, game)) {
+        if (firstPlayer.chooseUse(Outcome.Benefit, "Deal one damage to " + secondPlayer.getLogName() + "?", source, game)) {
             secondPlayer.damage(1, source.getSourceId(), game, false, true);
         }
         return true;
diff --git a/Mage/src/main/java/mage/MageInt.java b/Mage/src/main/java/mage/MageInt.java
index cf0825ab9ea7..9507918a8cc0 100644
--- a/Mage/src/main/java/mage/MageInt.java
+++ b/Mage/src/main/java/mage/MageInt.java
@@ -1,11 +1,11 @@
-
 package mage;
 
+import mage.util.CardUtil;
+import mage.util.Copyable;
+
 import java.io.Serializable;
 import java.util.Objects;
 
-import mage.util.Copyable;
-
 public class MageInt implements Serializable, Copyable<MageInt> {
 
     public static final MageInt EmptyMageInt = new MageInt(Integer.MIN_VALUE, "") {
@@ -80,7 +80,7 @@ public void setValue(int value) {
     }
 
     public void boostValue(int amount) {
-        this.boostedValue += amount;
+        this.boostedValue = CardUtil.addWithOverflowCheck(this.boostedValue, amount);
     }
 
     public void resetToBaseValue() {
diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
index f4a6a2842916..cf2358d8f176 100644
--- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
+++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
@@ -1,6 +1,5 @@
 package mage.game.permanent;
 
-import java.util.*;
 import mage.MageObject;
 import mage.MageObjectReference;
 import mage.ObjectColor;
@@ -38,6 +37,8 @@
 import mage.util.ThreadLocalStringBuilder;
 import org.apache.log4j.Logger;
 
+import java.util.*;
+
 /**
  * @author BetaSteward_at_googlemail.com
  */
@@ -757,7 +758,7 @@ public void attachTo(UUID attachToObjectId, Game game) {
         this.attachedTo = attachToObjectId;
         this.attachedToZoneChangeCounter = game.getState().getZoneChangeCounter(attachToObjectId);
         for (Ability ability : this.getAbilities()) {
-            for (Iterator<Effect> ite = ability.getEffects(game, EffectType.CONTINUOUS).iterator(); ite.hasNext();) {
+            for (Iterator<Effect> ite = ability.getEffects(game, EffectType.CONTINUOUS).iterator(); ite.hasNext(); ) {
                 ContinuousEffect effect = (ContinuousEffect) ite.next();
                 game.getContinuousEffects().setOrder(effect);
                 // It's important to update the timestamp of the copied effect in ContinuousEffects because it does the action
@@ -812,8 +813,8 @@ public int damage(int damage, UUID sourceId, Game game, boolean combat, boolean
      * @param game
      * @param preventable
      * @param combat
-     * @param markDamage If true, damage will be dealt later in applyDamage
-     * method
+     * @param markDamage   If true, damage will be dealt later in applyDamage
+     *                     method
      * @return
      */
     private int damage(int damageAmount, UUID sourceId, Game game, boolean preventable, boolean combat, boolean markDamage, List<UUID> appliedEffects) {
@@ -952,7 +953,6 @@ protected int damageCreature(int damage, UUID sourceId, Game game, boolean preve
                         addCounters(CounterType.M1M1.createInstance(actualDamage), damageSourceAbility, game);
                     }
                 } else {
-                    // this.damage += actualDamage;
                     this.damage = CardUtil.addWithOverflowCheck(this.damage, actualDamage);
                 }
                 game.fireEvent(new DamagedCreatureEvent(objectId, sourceId, controllerId, actualDamage, combat));