diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
index f8dcd0f837a..76ad2e53e37 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
@@ -500,6 +500,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                     if (sa.hasParam("Unearth")) {
                         movedCard.setUnearthed(true);
                     }
+                    if (sa.hasParam("FaceDown")) {
+                        movedCard.setState(CardCharacteristicName.FaceDown);
+                    }
                     if (sa.hasParam("Ninjutsu") || sa.hasParam("Attacking")) {
                         // What should they attack?
                         // TODO Ninjutsu needs to actually select the Defender, instead of auto selecting player
@@ -896,6 +899,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                 if (sa.hasParam("Tapped")) {
                     movedCard.setTapped(true);
                 }
+                if (sa.hasParam("FaceDown")) {
+                    movedCard.setState(CardCharacteristicName.FaceDown);
+                }
                 movedCard.setTimestamp(ts);
             } else if (destination.equals(ZoneType.Exile)) {
                 movedCard = game.getAction().exile(c);
diff --git a/forge-game/src/main/java/forge/game/card/CounterType.java b/forge-game/src/main/java/forge/game/card/CounterType.java
index c962d86d7cc..d7b8ae77ffb 100644
--- a/forge-game/src/main/java/forge/game/card/CounterType.java
+++ b/forge-game/src/main/java/forge/game/card/CounterType.java
@@ -102,6 +102,8 @@ public enum CounterType {
 
     FUSE(),
 
+    GEM(),
+
     GLYPH(),
 
     GOLD(),
diff --git a/forge-gui/res/cardsfolder/e/elixir_of_immortality.txt b/forge-gui/res/cardsfolder/e/elixir_of_immortality.txt
index f053e8c9da4..582b6f2b43e 100644
--- a/forge-gui/res/cardsfolder/e/elixir_of_immortality.txt
+++ b/forge-gui/res/cardsfolder/e/elixir_of_immortality.txt
@@ -2,7 +2,7 @@ Name:Elixir of Immortality
 ManaCost:1
 Types:Artifact
 A:AB$ GainLife | Cost$ 2 T | LifeAmount$ 5 | SubAbility$ DBShuffleElixir | SpellDescription$ You gain 5 life. Shuffle CARDNAME and your graveyard into their owner's library.
-SVar:DBShuffleElixir:DB$ChangeZone | Origin$ Battlefield | Destination$ Library | Shuffle$ True | Defined$ Self | SubAbility$ DBShuffleGrave
+SVar:DBShuffleElixir:DB$ChangeZone | Origin$ Battlefield | Destination$ Library | Shuffle$ False | Defined$ Self | SubAbility$ DBShuffleGrave
 SVar:DBShuffleGrave:DB$ChangeZoneAll | Origin$ Graveyard | Destination$ Library | Shuffle$ True | ChangeType$ Card.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elixir_of_immortality.jpg
 Oracle:{2}, {T}: You gain 5 life. Shuffle Elixir of Immortality and your graveyard into their owner's library.