diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java
index 6948b40a292..681c7882c45 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java
@@ -30,7 +30,6 @@ package mage.sets.newphyrexia;
 
 import java.util.UUID;
 import mage.constants.CardType;
-import mage.constants.Outcome;
 import mage.constants.Rarity;
 import mage.constants.Zone;
 import mage.MageInt;
@@ -38,7 +37,6 @@ import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.EntersBattlefieldEffect;
-import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CopyPermanentEffect;
 import mage.cards.CardImpl;
 import mage.filter.FilterPermanent;
@@ -46,9 +44,6 @@ import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.players.Player;
-import mage.target.Target;
-import mage.target.TargetPermanent;
 import mage.util.functions.ApplyToPermanent;
 
 /**
diff --git a/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java b/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
index a30192d886e..92dbfa7aa0d 100644
--- a/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
+++ b/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
@@ -95,21 +95,14 @@ public class EntersBattlefieldEffect extends ReplacementEffectImpl {
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == EventType.ENTERS_THE_BATTLEFIELD) {
-            if (event.getTargetId().equals(source.getSourceId())) {
-                if (condition == null || condition.apply(game, source)) {
-                    return true;
-                }
+        if (event.getTargetId().equals(source.getSourceId())) {
+            if (condition == null || condition.apply(game, source)) {
+                return true;
             }
         }
         return false;
     }
 
-    @Override
-    public boolean apply(Game game, Ability source) {
-        return false;
-    }
-
     @Override
     public boolean replaceEvent(GameEvent event, Ability source, Game game) {
         if (optional) {
diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java
index 6ed437d0891..77b9483002c 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java
@@ -80,6 +80,7 @@ public class GainAbilityAllEffect extends ContinuousEffectImpl {
     public GainAbilityAllEffect(final GainAbilityAllEffect effect) {
         super(effect);
         this.ability = effect.ability.copy();
+        ability.newId(); // This is needed if the effect is copied e.g. by a clone so the ability can be added multiple times to permanents
         this.filter = effect.filter.copy();
         this.excludeSource = effect.excludeSource;
     }
diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java
index cdbc829cbbe..6a0509da83d 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java
@@ -80,6 +80,7 @@ public class GainAbilityAttachedEffect extends ContinuousEffectImpl {
     public GainAbilityAttachedEffect(final GainAbilityAttachedEffect effect) {
         super(effect);
         this.ability = effect.ability.copy();
+        ability.newId(); // This is needed if the effect is copied e.g. by a clone so the ability can be added multiple times to permanents
         this.attachmentType = effect.attachmentType;
         this.fixedTarget = effect.fixedTarget;
     }
diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityPairedEffect.java b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityPairedEffect.java
index 7f7b4c49e78..686b7f0a525 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityPairedEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityPairedEffect.java
@@ -54,6 +54,7 @@ public class GainAbilityPairedEffect extends ContinuousEffectImpl {
     public GainAbilityPairedEffect(final GainAbilityPairedEffect effect) {
         super(effect);
         this.ability = effect.ability.copy();
+        ability.newId(); // This is needed if the effect is copied e.g. by a clone so the ability can be added multiple times to permanents
     }
 
     @Override
@@ -68,7 +69,7 @@ public class GainAbilityPairedEffect extends ContinuousEffectImpl {
             Permanent paired = game.getPermanent(permanent.getPairedCard());
             if (paired != null) {
                 permanent.addAbility(ability, game);
-                paired.addAbility(ability, source.getSourceId(), game);
+                paired.addAbility(ability, source.getSourceId(), game, false);
                 return true;
             }
         }
diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilitySourceEffect.java b/Mage/src/mage/abilities/effects/common/continuous/GainAbilitySourceEffect.java
index cd691be7fe4..81fc17c970c 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/GainAbilitySourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/GainAbilitySourceEffect.java
@@ -80,6 +80,7 @@ public class GainAbilitySourceEffect extends ContinuousEffectImpl implements Sou
     public GainAbilitySourceEffect(final GainAbilitySourceEffect effect) {
         super(effect);
         this.ability = effect.ability.copy();
+        ability.newId(); // This is needed if the effect is copied e.g. by a clone so the ability can be added multiple times to permanents
         this.onCard = effect.onCard;
     }
 
diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java
index d8635ef0f26..404c0476d7f 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java
@@ -77,6 +77,7 @@ public class GainAbilityTargetEffect extends ContinuousEffectImpl {
     public GainAbilityTargetEffect(final GainAbilityTargetEffect effect) {
         super(effect);
         this.ability = effect.ability.copy();
+        ability.newId(); // This is needed if the effect is copied e.g. by a clone so the ability can be added multiple times to permanents
         this.onCard = effect.onCard;
         this.durationPhaseStep = effect.durationPhaseStep;
         this.durationPlayerId = effect.durationPlayerId;