diff --git a/Mage.Sets/src/mage/sets/commander2013/TerraRavager.java b/Mage.Sets/src/mage/sets/commander2013/TerraRavager.java
index 79aa1e48467b..0dda70fa4d06 100644
--- a/Mage.Sets/src/mage/sets/commander2013/TerraRavager.java
+++ b/Mage.Sets/src/mage/sets/commander2013/TerraRavager.java
@@ -106,6 +106,6 @@ public String toString() {
 
     @Override
     public String getMessage() {
-        return "land defending player controls";
+        return "the number of lands defending player controls";
     }
 }
diff --git a/Mage.Sets/src/mage/sets/worldwake/DeathsShadow.java b/Mage.Sets/src/mage/sets/worldwake/DeathsShadow.java
index 06208b8a2b35..57ea6364b1c6 100644
--- a/Mage.Sets/src/mage/sets/worldwake/DeathsShadow.java
+++ b/Mage.Sets/src/mage/sets/worldwake/DeathsShadow.java
@@ -55,7 +55,8 @@ public DeathsShadow(UUID ownerId) {
         this.toughness = new MageInt(13);
 
         // Death's Shadow gets -X/-X, where X is your life total.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new SignInversionDynamicValue(new ControllerLifeCount()), new SignInversionDynamicValue(new ControllerLifeCount()), Duration.WhileOnBattlefield)));
+        SignInversionDynamicValue x = new SignInversionDynamicValue(new ControllerLifeCount());
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(x, x, Duration.WhileOnBattlefield)));
     }
 
     public DeathsShadow(final DeathsShadow card) {
diff --git a/Mage/src/mage/abilities/effects/common/continuous/BoostSourceEffect.java b/Mage/src/mage/abilities/effects/common/continuous/BoostSourceEffect.java
index bb671aa3b69c..93ab0363ad64 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/BoostSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/BoostSourceEffect.java
@@ -137,14 +137,24 @@ private void setText() {
         if (duration != Duration.WhileOnBattlefield) {
             sb.append(" ").append(duration.toString());
         }
-        String message = power.getMessage();
-        if (message.length() == 0) {
+        String message = null;
+        String fixedPart = null;
+        if (t.contains("X")) {
             message = toughness.getMessage();
+            fixedPart = ", where X is ";
+        } else if (p.contains("X")) {
+            message = power.getMessage();
+            fixedPart = ", where X is ";
+        } else if (!power.getMessage().isEmpty()) {
+            message = power.getMessage();
+            fixedPart = " for each ";
+        } else if (!toughness.getMessage().isEmpty()) {
+            message = toughness.getMessage();
+            fixedPart = " for each ";
         }
-        if (message.length() > 0) {
-            sb.append(" for each ");
+        if (message != null && !message.isEmpty() && fixedPart != null) {
+            sb.append(fixedPart).append(message);
         }
-        sb.append(message);
         staticText = sb.toString();
     }
 
diff --git a/Mage/src/mage/abilities/effects/common/continuous/BoostTargetEffect.java b/Mage/src/mage/abilities/effects/common/continuous/BoostTargetEffect.java
index 1d11baae7933..9ced7947bb8b 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/BoostTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/BoostTargetEffect.java
@@ -150,10 +150,10 @@ public String getText(Mode mode) {
         }
         String message = null;
         String fixedPart = null;
-        if (t.equals("X")) {
+        if (t.contains("X")) {
             message = toughness.getMessage();
             fixedPart = ", where X is ";
-        } else if (p.equals("X")) {
+        } else if (p.contains("X")) {
             message = power.getMessage();
             fixedPart = ", where X is ";
         } else if (!power.getMessage().isEmpty()) {