diff --git a/Mage.Sets/src/mage/sets/modernmasters/LatchkeyFaerie.java b/Mage.Sets/src/mage/sets/modernmasters/LatchkeyFaerie.java
index 16f6b680af2..c3a61d5b0a0 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/LatchkeyFaerie.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/LatchkeyFaerie.java
@@ -51,14 +51,15 @@ public class LatchkeyFaerie extends CardImpl {
         this.subtype.add("Faerie");
         this.subtype.add("Rogue");
 
-        this.color.setBlue(true);
         this.power = new MageInt(3);
         this.toughness = new MageInt(1);
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
+
         // Prowl {2}{U}
         this.addAbility(new ProwlAbility(this, "{2}{U}"));
+
         // When Latchkey Faerie enters the battlefield, if its prowl cost was paid, draw a card.
         EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false);
         this.addAbility(new ConditionalTriggeredAbility(ability, ProwlCondition.getInstance(),
diff --git a/Mage.Sets/src/mage/sets/modernmasters/MarshFlitter.java b/Mage.Sets/src/mage/sets/modernmasters/MarshFlitter.java
index b8a54e1a3c6..56a97459bb9 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/MarshFlitter.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/MarshFlitter.java
@@ -64,7 +64,6 @@ public class MarshFlitter extends CardImpl {
         this.subtype.add("Faerie");
         this.subtype.add("Rogue");
 
-        this.color.setBlack(true);
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
diff --git a/Mage/src/mage/abilities/effects/common/continuous/SetPowerToughnessSourceEffect.java b/Mage/src/mage/abilities/effects/common/continuous/SetPowerToughnessSourceEffect.java
index 62a2ad491a1..245122eb77b 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/SetPowerToughnessSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/SetPowerToughnessSourceEffect.java
@@ -36,6 +36,7 @@ import mage.constants.Duration;
 import mage.constants.Layer;
 import mage.constants.Outcome;
 import mage.constants.SubLayer;
+import mage.constants.Zone;
 import mage.game.Game;
 
 /**
@@ -75,7 +76,13 @@ public class SetPowerToughnessSourceEffect extends ContinuousEffectImpl {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        MageObject mageObject = game.getObject(source.getSourceId()); // there are character definig abilities (e.g. P/T Nightmare) that have to work also for P/T of cards
+        MageObject mageObject;
+        if (source.getZone() == Zone.BATTLEFIELD) {
+            mageObject = source.getSourceObjectIfItStillExists(game);
+        } else {
+            mageObject = game.getObject(source.getSourceId()); // there are character definig abilities (e.g. P/T Nightmare) that have to work also for P/T of cards
+        }
+        
         if (mageObject == null) {
             if (duration.equals(Duration.Custom)) {
                 discard();