diff --git a/desktop/src-common/advent/screens/rooms/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj
index 7a44945e..04556010 100644
--- a/desktop/src-common/advent/screens/rooms/castle_gate.clj
+++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj
@@ -82,9 +82,13 @@
       :script (actions/get-script entities
                                   (if (get-in @entities [:tweens :coin-y]) 
                                     (do
-                                      (actions/talk entities :ego "Hey, Bubba!" :wait false)
                                       (actions/update-entities entities (fn [entities]
-                                                                          (update-in entities [:tweens] dissoc :coin-y)))
+                                                                          (assoc-in entities [:room :entities :coin-flip :opacity] 1.0)))
+                                      (actions/talk entities :ego "Hey, Bubba!" :wait false) 
+                                      (actions/update-entities entities (fn [entities]
+                                                                          (-> entities
+                                                                              (update-in [:tweens] dissoc :coin-y)
+                                                                              (assoc-in [:room :entities :coin-flip :opacity] 1.0))))
 
                                       (actions/walk-straight-to entities :coin-flip [212 90] :update-baseline? false  :speed 3.0)
                                       (screen! dialogue/talking-screen :stop-talk)
diff --git a/desktop/src-common/advent/screens/rooms/inside_stash.clj b/desktop/src-common/advent/screens/rooms/inside_stash.clj
index 1ef2bc59..0059e879 100644
--- a/desktop/src-common/advent/screens/rooms/inside_stash.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_stash.clj
@@ -43,7 +43,7 @@
      (actions/play-animation entities :ego :reach)
      (actions/do-dialogue entities
                           :ego "Yes! I got my stuff back!"
-                          :ego "Including the Slinger's shot!")
+                          :ego "Including the Slinger's Shot!")
      (actions/update-state entities #(-> % (assoc :inventory (concat (:inventory %) [:flask-1-strength :medal :trophy :slingshot])))))
     :else
     (do
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index 0785c72c..e023646c 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -324,7 +324,14 @@ void main ()
                             (actions/talk entities :ego "Better not hum it with Gandarf around!")
                             (actions/talk entities :wizard "What's that, boy?")
                             (actions/talk entities :ego "Oh... Erm... Nothing."))
-                          (get-in @entities [:room :entities :warden])
+
+                          (= :space
+                             (get-in @entities [:state :last-room]))
+                          (actions/talk entities :ego "No time for that!")
+
+                          (= :inside-jail
+                             (get-in @entities [:state :last-room]))
+
                           (do
                             (actions/talk entities :ego "I'll whistle it really quietly.")
                             (actions/play-safe entities)