diff --git a/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java b/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java
index 695edcb467..4792339374 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java
@@ -28,19 +28,17 @@
 package mage.sets.gatecrash;
 
 import java.util.UUID;
-import mage.Constants;
 import mage.Constants.CardType;
+import mage.Constants.Outcome;
 import mage.Constants.Rarity;
+import mage.Constants.TargetController;
 import mage.Constants.Zone;
 import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.effects.common.AttachEffect;
-import mage.abilities.effects.common.counter.AddCountersTargetEffect;
 import mage.abilities.effects.common.counter.AddPlusOneCountersAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
-import mage.counters.Counter;
-import mage.counters.CounterType;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
@@ -60,12 +58,12 @@ public class ForcedAdaptation extends CardImpl<ForcedAdaptation> {
         // Enchant creature
         TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
-        this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature));
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
 
         // At the beginning of your upkeep, put a +1/+1 counter on enchanted creature.
-        this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(1), Constants.TargetController.YOU, false));
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(1), TargetController.YOU, false));
     }
 
     public ForcedAdaptation(final ForcedAdaptation card) {
diff --git a/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java b/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java
index e08190c41b..9ef4ac06a1 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/WreckingOgre.java
@@ -28,8 +28,8 @@
 package mage.sets.gatecrash;
 
 import java.util.UUID;
-import mage.Constants;
 import mage.Constants.CardType;
+import mage.Constants.Duration;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.Ability;
@@ -38,6 +38,7 @@ import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
 import mage.abilities.keyword.BloodrushAbility;
 import mage.abilities.keyword.DoubleStrikeAbility;
 import mage.cards.CardImpl;
+import mage.target.common.TargetAttackingCreature;
 
 /**
  *
@@ -58,8 +59,10 @@ public class WreckingOgre extends CardImpl<WreckingOgre> {
         // Double strike
         this.addAbility(DoubleStrikeAbility.getInstance());
         // Bloodrush - {3}{R}{R}, Discard Wrecking Ogre: Target attacking creature gets +3/+3 and gains double strike until end of turn.
-        Ability ability = new BloodrushAbility("{3}{R}{R}", new BoostTargetEffect(3, 3, Constants.Duration.EndOfTurn));
-        ability.addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Constants.Duration.EndOfTurn));
+        Ability ability = new BloodrushAbility("{3}{R}{R}", new BoostTargetEffect(3, 3, Duration.EndOfTurn));
+        ability.addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn));
+        ability.addTarget(new TargetAttackingCreature());
+        this.addAbility(ability);
     }
 
     public WreckingOgre(final WreckingOgre card) {