diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pioneer.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pioneer.java
index 1a98d4e4d3..8ecf14fbe7 100644
--- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pioneer.java
+++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pioneer.java
@@ -15,7 +15,7 @@ public class Pioneer extends Constructed {
     public Pioneer() {
         super("Constructed - Pioneer");
 
-        Date cutoff = new GregorianCalendar(2012, 10, 5).getTime(); // M15 release date
+        Date cutoff = new GregorianCalendar(2012, 10, 5).getTime(); // RTR release date
         for (ExpansionSet set : Sets.getInstance().values()) {
             if (set.getSetType().isStandardLegal() && (set.getReleaseDate().after(cutoff) || set.getReleaseDate().equals(cutoff))) {
                 setCodes.add(set.getCode());
diff --git a/Mage.Sets/src/mage/cards/e/EscapedShapeshifter.java b/Mage.Sets/src/mage/cards/e/EscapedShapeshifter.java
index 20414b5be9..935988818f 100644
--- a/Mage.Sets/src/mage/cards/e/EscapedShapeshifter.java
+++ b/Mage.Sets/src/mage/cards/e/EscapedShapeshifter.java
@@ -72,7 +72,7 @@ class EscapedShapeshifterEffect extends ContinuousEffectImpl {
                         source.getControllerId(), source.getSourceId(), game
                 ).stream()
                 .filter(Objects::nonNull)
-                .filter(permanent -> !permanent.getName().equals(sourcePermanent.getName()))
+                .filter(permanent -> !permanent.getName().equals("Escaped Shapeshifter"))
                 .map(Permanent::getAbilities)
                 .flatMap(Collection::stream).filter(EscapedShapeshifterEffect::checkAbility)
                 .forEach(ability -> sourcePermanent.addAbility(ability, source.getSourceId(), game));
diff --git a/Mage.Sets/src/mage/sets/ReturnToRavnica.java b/Mage.Sets/src/mage/sets/ReturnToRavnica.java
index 5e8ea7ba90..b796538994 100644
--- a/Mage.Sets/src/mage/sets/ReturnToRavnica.java
+++ b/Mage.Sets/src/mage/sets/ReturnToRavnica.java
@@ -18,7 +18,7 @@ public final class ReturnToRavnica extends ExpansionSet {
     }
 
     private ReturnToRavnica() {
-        super("Return to Ravnica", "RTR", ExpansionSet.buildDate(2012, 9, 29), SetType.EXPANSION);
+        super("Return to Ravnica", "RTR", ExpansionSet.buildDate(2012, 10, 5), SetType.EXPANSION);
         this.blockName = "Return to Ravnica";
         this.hasBoosters = true;
         this.numBoosterLands = 1;