diff --git a/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java b/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java
index e09a88db5f..5d17043a0f 100644
--- a/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java
+++ b/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java
@@ -74,7 +74,7 @@ public class FreeForAll extends GameImpl<FreeForAll> {
 
     @Override
     public Set<UUID> getOpponents(UUID playerId) {
-        Set<UUID> opponents = new HashSet<UUID>();
+        Set<UUID> opponents = new HashSet<>();
         for (UUID opponentId: this.getPlayer(playerId).getInRange()) {
             if (!opponentId.equals(playerId)) {
                 opponents.add(opponentId);
@@ -85,7 +85,7 @@ public class FreeForAll extends GameImpl<FreeForAll> {
 
     @Override
     public boolean isOpponent(Player player, UUID playerToCheck) {
-       return player.getInRange().contains(playerToCheck);
+       return !player.getId().equals(playerToCheck) && player.getInRange().contains(playerToCheck);
     }
     
     @Override
diff --git a/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java
index c4d7396108..f20d21bce6 100644
--- a/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java
@@ -94,7 +94,7 @@ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl<Begi
                         }
                         return true;
                     }
-            break;
+                    break;
                 case ANY:
                     if (setTargetPointer && getTargets().size() == 0) {
                         for (Effect effect : this.getEffects()) {
@@ -115,6 +115,9 @@ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl<Begi
                             return true;
                         }
                     }
+                    break;
+                default:
+                    throw new UnsupportedOperationException("Value for targetController not supported: " + targetController.toString());
             }
         }
         return false;
diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java
index a0ef6a7b39..df9e804150 100644
--- a/Mage/src/mage/players/PlayerImpl.java
+++ b/Mage/src/mage/players/PlayerImpl.java
@@ -2170,7 +2170,7 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
 
     @Override
     public boolean hasOpponent(UUID playerToCheckId, Game game) {
-        return game.isOpponent(this, playerToCheckId);
+        return !this.getId().equals(playerToCheckId) && game.isOpponent(this, playerToCheckId);
     }
 
     @Override