From c91e56b937f33fa0c730ecd7e95a8e26758a810e Mon Sep 17 00:00:00 2001
From: Noah Gleason <noah.gleason1@gmail.com>
Date: Sun, 8 Jul 2018 22:01:37 -0400
Subject: [PATCH 1/2] Fix Rite of Belzenlok token not damaging its controller

---
 .../mage/game/permanent/token/BelzenlokDemonToken.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java
index 4ba0d93601d..81883c03a14 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java
@@ -21,6 +21,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.permanent.AnotherPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
+import mage.players.Player;
 
 /**
  *
@@ -94,9 +95,9 @@ class BelzenlokDemonTokenEffect extends OneShotEffect {
         if (otherCreatures > 0) {
             new SacrificeControllerEffect(filter, 1, "").apply(game, source);
         } else {
-            Permanent permanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
-            if (permanent != null) {
-                permanent.damage(6, permanent.getId(), game, false, true);
+            Player controller = game.getPlayer(source.getControllerId());
+            if (controller != null) {
+                controller.damage(6, source.getSourceId(), game, false, true);
             }
         }
         return true;

From 11dffe2182b5290b5fb6afec73ec7828bf595c6c Mon Sep 17 00:00:00 2001
From: Noah Gleason <noah.gleason1@gmail.com>
Date: Sun, 8 Jul 2018 22:10:13 -0400
Subject: [PATCH 2/2] Fix Chaos Wand

---
 Mage.Sets/src/mage/cards/c/ChaosWand.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Mage.Sets/src/mage/cards/c/ChaosWand.java b/Mage.Sets/src/mage/cards/c/ChaosWand.java
index 1a13b28d8e3..f5f790060aa 100644
--- a/Mage.Sets/src/mage/cards/c/ChaosWand.java
+++ b/Mage.Sets/src/mage/cards/c/ChaosWand.java
@@ -82,14 +82,16 @@ class ChaosWandEffect extends OneShotEffect {
                 break;
             }
             opponent.moveCards(card, Zone.EXILED, source, game);
+            controller.revealCards(source, new CardsImpl(card), game);
             if (card.isInstant() || card.isSorcery()) {
                 if (!controller.chooseUse(outcome, "Cast " + card.getName() + " without paying its mana cost?", source, game)
                         || !controller.cast(card.getSpellAbility(), game, true, new MageObjectReference(source.getSourceObject(game), game))) {
                     cardsToShuffle.add(card);
                 }
                 break;
+            } else {
+                cardsToShuffle.add(card);
             }
-            cardsToShuffle.add(card);
         }
         return opponent.putCardsOnBottomOfLibrary(cardsToShuffle, game, source, false);
     }