diff --git a/src/clj/game/cards/agendas.clj b/src/clj/game/cards/agendas.clj
index a79ca98c27..f4c6904ca7 100644
--- a/src/clj/game/cards/agendas.clj
+++ b/src/clj/game/cards/agendas.clj
@@ -18,7 +18,7 @@
    [game.core.damage :refer [damage damage-bonus]]
    [game.core.def-helpers :refer [corp-recur defcard do-net-damage
                                   offer-jack-out reorder-choice get-x-fn]]
-   [game.core.drawing :refer [draw]]
+   [game.core.drawing :refer [draw draw-up-to]]
    [game.core.effects :refer [register-lingering-effect]]
    [game.core.eid :refer [effect-completed make-eid]]
    [game.core.engine :refer [pay register-events resolve-ability
@@ -1129,10 +1129,11 @@
                       (update-all-agenda-points state)
                       (check-win-by-agenda state side)
                       (effect-completed state side eid))
-         :cancel-effect (effect (system-msg (str "declines to use " (:title card))))}]
+         :cancel-effect (effect (system-msg (str "declines to use " (:title card)))
+                                (effect-completed eid))}]
     {:on-score {:async true
                 :effect (req (wait-for
-                               (draw state side 3)
+                               (draw-up-to state side card 3)
                                (continue-ability state side add-abi card nil)))}}))
 
 (defcard "Labyrinthine Servers"
diff --git a/src/clj/game/cards/ice.clj b/src/clj/game/cards/ice.clj
index 0312b7615d..4f05017713 100644
--- a/src/clj/game/cards/ice.clj
+++ b/src/clj/game/cards/ice.clj
@@ -1199,18 +1199,18 @@
    :events [{:event :end-of-encounter
              :req (req (and (= :this-turn (:rezzed card))
                             (same-card? (:ice context) card)))
-             :msg "force the Runner to choose a subroutine to resolve"
+             :msg "force the Runner to choose an effect"
              :effect (effect (continue-ability
                                {:prompt "Choose one"
                                 :player :runner
-                                :choices (req [(when (seq (all-installed-runner state)) "Corp trashes 1 Runner card")
+                                :choices (req ["Corp trashes 1 Runner card"
                                                (when-not (forced-to-avoid-tags? state side) "Take 2 tags")
                                                (when (can-pay? state :runner eid card nil :net 3)
                                                  "Suffer 3 net damage")])
                                 :async true
                                 :effect (req
                                           (continue-ability
-                                            state :runner
+                                            state (if (= target "Corp trashes 1 Runner card") :corp :runner)
                                             (cond
                                               (= target "Corp trashes 1 Runner card")
                                               trash-installed-sub