diff --git a/goal_src/jak2/pc/pckernel.gc b/goal_src/jak2/pc/pckernel.gc
index 55c734cf38..81f53caf5e 100644
--- a/goal_src/jak2/pc/pckernel.gc
+++ b/goal_src/jak2/pc/pckernel.gc
@@ -661,7 +661,13 @@
                 (when (or (zero? unlock-func)
                           (not unlock-func)
                           (unlock-func))
-                    (logior! (-> obj cheats-unlocked) (-> cheat flag)))))))
+                    (logior! (-> obj cheats-unlocked) (-> cheat flag)))))
+        (case (-> cheat can-toggle)
+          ((#f)
+            (when (logtest? (-> obj cheats-unlocked) (-> cheat flag))
+              (logior! (-> obj cheats) (-> cheat flag)))
+            )
+          )))
 
   0)
 
diff --git a/goal_src/jak2/pc/progress/progress-draw-pc.gc b/goal_src/jak2/pc/progress/progress-draw-pc.gc
index 43bc510351..0249c9abcd 100644
--- a/goal_src/jak2/pc/progress/progress-draw-pc.gc
+++ b/goal_src/jak2/pc/progress/progress-draw-pc.gc
@@ -1623,7 +1623,7 @@
 
 (defmethod draw-option ((this menu-unlocked-menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
   (let ((secrets (memcard-unlocked-secrets? #t))
-        (cheats (-> *pc-settings* cheats-unlocked))
+        (cheats (-> *pc-settings* cheats))
         (alpha (* 2.0 (- 0.5 (-> arg0 menu-transition))))
         )
     (if (< alpha 0.0)
diff --git a/goal_src/jak2/pc/progress/progress-pc.gc b/goal_src/jak2/pc/progress/progress-pc.gc
index 8f61482fa4..add2fabc8f 100644
--- a/goal_src/jak2/pc/progress/progress-pc.gc
+++ b/goal_src/jak2/pc/progress/progress-pc.gc
@@ -342,6 +342,9 @@
      (set! (-> *progress-state-pc* music-player-selected) #f)
      (set! (-> (the-as menu-music-player-option (-> *music-player-options* options 0)) excitement) 0)
      (set! (-> obj current-options) *music-player-options*)
+     (when (aif (level-get *level* 'title) (= (-> it status) 'active))
+         (remove-setting *setting-control* (handle->process (-> *game-info* controller 0)) 'music-volume)
+         )
      )
     (('resolutions)
      (set! (-> (the-as menu-resolution-option (-> *resolutions-options* options 0)) selected-index) -1)