diff --git a/Mage.Sets/src/mage/cards/a/AeonChronicler.java b/Mage.Sets/src/mage/cards/a/AeonChronicler.java
index c9117830c4..021ad499ac 100644
--- a/Mage.Sets/src/mage/cards/a/AeonChronicler.java
+++ b/Mage.Sets/src/mage/cards/a/AeonChronicler.java
@@ -27,6 +27,7 @@
  */
 package mage.cards.a;
 
+import java.util.Objects;
 import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
@@ -101,7 +102,7 @@ class AeonChroniclerTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        return event.getData() == CounterType.TIME.getName() && event.getTargetId().equals(this.getSourceId());
+        return Objects.equals(event.getData(), CounterType.TIME.getName()) && event.getTargetId().equals(this.getSourceId());
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/i/IllusionistsGambit.java b/Mage.Sets/src/mage/cards/i/IllusionistsGambit.java
index 8d0754973b..7d8b63b1be 100644
--- a/Mage.Sets/src/mage/cards/i/IllusionistsGambit.java
+++ b/Mage.Sets/src/mage/cards/i/IllusionistsGambit.java
@@ -28,6 +28,7 @@
 package mage.cards.i;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility;
@@ -147,7 +148,7 @@ class IllusionistsGambitRequirementEffect extends RequirementEffect {
     @Override
     public boolean isInactive(Ability source, Game game) {
         if (game.getTurn().getStepType() == PhaseStep.END_COMBAT) {
-            if (game.getTurn().getPhase() != phase) {
+            if (!Objects.equals(game.getTurn().getPhase(), phase)) {
                 return true;
             }
         }
@@ -191,7 +192,7 @@ class IllusionistsGambitRestrictionEffect extends RestrictionEffect {
     @Override
     public boolean isInactive(Ability source, Game game) {
         if (game.getTurn().getStepType() == PhaseStep.END_COMBAT) {
-            if (game.getTurn().getPhase() != phase) {
+            if (!Objects.equals(game.getTurn().getPhase(), phase)) {
                 return true;
             }
         }