diff --git a/Mage.Sets/src/mage/cards/g/GoblinRacketeer.java b/Mage.Sets/src/mage/cards/g/GoblinRacketeer.java
index caadb9f8da..a4c3c44b11 100644
--- a/Mage.Sets/src/mage/cards/g/GoblinRacketeer.java
+++ b/Mage.Sets/src/mage/cards/g/GoblinRacketeer.java
@@ -2,6 +2,7 @@
 package mage.cards.g;
 
 import java.util.UUID;
+
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.AttacksTriggeredAbility;
@@ -16,7 +17,6 @@ import mage.game.Game;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
- *
  * @author TheElk801
  */
 public final class GoblinRacketeer extends CardImpl {
@@ -35,6 +35,7 @@ public final class GoblinRacketeer extends CardImpl {
         Ability ability = new AttacksTriggeredAbility(new GoadTargetEffect(), true, "Whenever {this} attacks, you may goad target creature defending player controls");
         ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature defending player controls")));
         originalId = ability.getOriginalId();
+        this.addAbility(ability);
     }
 
     public GoblinRacketeer(final GoblinRacketeer card) {
diff --git a/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java b/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java
index f807e29147..389a96dd0f 100644
--- a/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java
+++ b/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java
@@ -2,22 +2,20 @@
 package mage.cards.m;
 
 import java.util.UUID;
+
 import mage.MageInt;
+import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
 import mage.abilities.decorator.ConditionalRequirementEffect;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.combat.AttacksIfAbleSourceEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.SubType;
-import mage.constants.ComparisonType;
-import mage.constants.Duration;
+import mage.constants.*;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.predicate.mageobject.NamePredicate;
 
 /**
- *
  * @author jeffwadsworth
  */
 public final class MaraudingMaulhorn extends CardImpl {
@@ -29,7 +27,7 @@ public final class MaraudingMaulhorn extends CardImpl {
     }
 
     public MaraudingMaulhorn(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{R}");
         this.subtype.add(SubType.BEAST);
 
         this.power = new MageInt(5);
@@ -40,6 +38,7 @@ public final class MaraudingMaulhorn extends CardImpl {
                 new AttacksIfAbleSourceEffect(Duration.WhileOnBattlefield, true),
                 new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.FEWER_THAN, 1));
         effect.setText("{this} attacks each combat if able unless you control a creature named Advocate of the Beast");
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
     }
 
     public MaraudingMaulhorn(final MaraudingMaulhorn card) {
diff --git a/Mage.Sets/src/mage/cards/s/SadisticAugermage.java b/Mage.Sets/src/mage/cards/s/SadisticAugermage.java
index df51481b1d..f6b2d9d83f 100644
--- a/Mage.Sets/src/mage/cards/s/SadisticAugermage.java
+++ b/Mage.Sets/src/mage/cards/s/SadisticAugermage.java
@@ -2,8 +2,10 @@
 package mage.cards.s;
 
 import java.util.UUID;
+
 import mage.MageInt;
 import mage.abilities.Ability;
+import mage.abilities.common.DiesTriggeredAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.Card;
 import mage.cards.CardImpl;
@@ -17,13 +19,12 @@ import mage.players.Player;
 import mage.target.common.TargetCardInHand;
 
 /**
- *
  * @author LevelX2
  */
 public final class SadisticAugermage extends CardImpl {
 
     public SadisticAugermage(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.WIZARD);
 
@@ -31,7 +32,7 @@ public final class SadisticAugermage extends CardImpl {
         this.toughness = new MageInt(1);
 
         // When Sadistic Augermage dies, each player puts a card from their hand on top of their library.
-        this.getSpellAbility().addEffect(null);
+        this.addAbility(new DiesTriggeredAbility(new WidespreadPanicEffect()));
     }
 
     public SadisticAugermage(final SadisticAugermage card) {
@@ -64,7 +65,7 @@ class WidespreadPanicEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            for (UUID playerId: game.getState().getPlayersInRange(controller.getId(), game)) {
+            for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
                 Player player = game.getPlayer(playerId);
                 if (player != null) {
                     if (!player.getHand().isEmpty()) {
@@ -76,7 +77,7 @@ class WidespreadPanicEffect extends OneShotEffect {
                             player.moveCardToLibraryWithInfo(card, source.getSourceId(), game, Zone.HAND, true, false);
                         }
                     }
-                }                
+                }
             }
             return true;
         }