diff --git a/ProjectObsidian/Components/Devices/MIDI_CC_Value.cs b/ProjectObsidian/Components/Devices/MIDI_CC_Value.cs
index b4c1ba7..8bbf2c5 100644
--- a/ProjectObsidian/Components/Devices/MIDI_CC_Value.cs
+++ b/ProjectObsidian/Components/Devices/MIDI_CC_Value.cs
@@ -41,9 +41,9 @@ protected override void OnStart()
         }
     }
 
-    protected override void OnPrepareDestroy()
+    protected override void OnDispose()
     {
-        base.OnPrepareDestroy();
+        base.OnDispose();
         if (_device != null)
         {
             _device.Control -= OnControl;
diff --git a/ProjectObsidian/Components/Devices/MIDI_InputDevice.cs b/ProjectObsidian/Components/Devices/MIDI_InputDevice.cs
index 55f0595..5bd246d 100644
--- a/ProjectObsidian/Components/Devices/MIDI_InputDevice.cs
+++ b/ProjectObsidian/Components/Devices/MIDI_InputDevice.cs
@@ -85,9 +85,9 @@ private async void ReleaseDeviceAsync()
         _inputDevice = null;
     }
 
-    protected override void OnPrepareDestroy()
+    protected override void OnDispose()
     {
-        base.OnPrepareDestroy();
+        base.OnDispose();
         if (_inputDevice != null)
         {
             ReleaseDeviceAsync();
@@ -197,7 +197,7 @@ private void OnMessageReceived(object sender, MidiReceivedEventArgs args)
         var events = MidiEvent.Convert(args.Data, args.Start, args.Length);
         foreach (var e in events)
         {
-            UniLog.Log(e.ToString());
+            if (DEBUG) UniLog.Log(e.ToString());
             RunSynchronously(() =>
             {
                 _lastEvent.Value = e.ToString();
diff --git a/ProjectObsidian/Components/Devices/MIDI_PitchWheel_Value.cs b/ProjectObsidian/Components/Devices/MIDI_PitchWheel_Value.cs
index dc914bd..3280950 100644
--- a/ProjectObsidian/Components/Devices/MIDI_PitchWheel_Value.cs
+++ b/ProjectObsidian/Components/Devices/MIDI_PitchWheel_Value.cs
@@ -36,9 +36,9 @@ protected override void OnStart()
         }
     }
 
-    protected override void OnPrepareDestroy()
+    protected override void OnDispose()
     {
-        base.OnPrepareDestroy();
+        base.OnDispose();
         if (_device != null)
         {
             _device.PitchWheel -= OnPitchWheel;