diff --git a/tracker/agb-xm-core/Cargo.toml b/tracker/agb-xm-core/Cargo.toml
index 15e27bf1d..d4e806d87 100644
--- a/tracker/agb-xm-core/Cargo.toml
+++ b/tracker/agb-xm-core/Cargo.toml
@@ -16,4 +16,4 @@ syn = "2"
 agb_tracker_interop = { version = "0.21.1", path = "../agb-tracker-interop", default-features = false }
 agb_fixnum = { version = "0.21.1", path = "../../agb-fixnum" }
 
-xmrs = { version = "=0.8.1", features = ["std", "import"] }
+xmrs = { version = "=0.8.5", features = ["std", "import"] }
diff --git a/tracker/agb-xm-core/src/lib.rs b/tracker/agb-xm-core/src/lib.rs
index 8122c4fbc..c7117b838 100644
--- a/tracker/agb-xm-core/src/lib.rs
+++ b/tracker/agb-xm-core/src/lib.rs
@@ -63,16 +63,17 @@ pub fn parse_module(module: &Module) -> agb_tracker_interop::Track {
             let volume = Num::from_f32(sample.volume);
 
             let sample = match &sample.data {
-                SampleDataType::Depth8(depth8) => depth8
+                SampleDataType::Mono8(depth8) => depth8
                     .iter()
                     .map(|value| *value as u8)
                     .take(sample_len)
                     .collect::<Vec<_>>(),
-                SampleDataType::Depth16(depth16) => depth16
+                SampleDataType::Mono16(depth16) => depth16
                     .iter()
                     .map(|sample| (sample >> 8) as i8 as u8)
                     .take(sample_len)
                     .collect::<Vec<_>>(),
+                _ => panic!("Stereo samples not supported"),
             };
 
             let fadeout = Num::from_f32(instrument.volume_fadeout);
@@ -652,7 +653,7 @@ static AMIGA_FREQUENCIES: &[u32] = &[
     457,
 ];
 
-#[derive(PartialEq, Eq, Hash, Clone)]
+#[derive(PartialEq, Eq, Hash, Clone, Debug)]
 struct EnvelopeData {
     amounts: Vec<Num<i16, 8>>,
     sustain: Option<usize>,
@@ -684,30 +685,30 @@ impl EnvelopeData {
             let first_point = &e.point[index];
             let second_point = &e.point[index + 1];
 
-            let amount = EnvelopePoint::lerp(first_point, second_point, xm_frame) / 64.0;
+            let amount = EnvelopePoint::lerp(first_point, second_point, xm_frame);
             let amount = Num::from_f32(amount);
 
             amounts.push(amount);
         }
 
         let sustain = if e.sustain_enabled {
-            Some(
-                Self::envelope_frame_to_gba_frame(e.point[e.sustain_point as usize].frame, bpm)
-                    as usize,
-            )
+            Some(Self::envelope_frame_to_gba_frame(
+                e.point[e.sustain_point].frame,
+                bpm,
+            ))
         } else {
             None
         };
         let (loop_start, loop_end) = if e.loop_enabled {
             (
                 Some(Self::envelope_frame_to_gba_frame(
-                    e.point[e.loop_start_point as usize].frame,
+                    e.point[e.loop_start_point].frame,
                     bpm,
-                ) as usize),
+                )),
                 Some(Self::envelope_frame_to_gba_frame(
-                    e.point[e.loop_end_point as usize].frame,
+                    e.point[e.loop_end_point].frame,
                     bpm,
-                ) as usize),
+                )),
             )
         } else {
             (None, None)
@@ -748,13 +749,13 @@ impl EnvelopeData {
         }
     }
 
-    fn envelope_frame_to_gba_frame(envelope_frame: u16, bpm: u32) -> u16 {
+    fn envelope_frame_to_gba_frame(envelope_frame: usize, bpm: u32) -> usize {
         // FT2 manual says number of ticks / second = BPM * 0.4
         // somehow this works as a good approximation :/
-        (envelope_frame as u32 * 250 / bpm) as u16
+        (envelope_frame as u32 * 250 / bpm) as usize
     }
 
-    fn gba_frame_to_envelope_frame(gba_frame: u16, bpm: u32) -> u16 {
-        (gba_frame as u32 * bpm / 250) as u16
+    fn gba_frame_to_envelope_frame(gba_frame: usize, bpm: u32) -> usize {
+        (gba_frame as u32 * bpm / 250) as usize
     }
 }
diff --git a/tracker/agb-xm/Cargo.toml b/tracker/agb-xm/Cargo.toml
index c26088ee6..81de4854f 100644
--- a/tracker/agb-xm/Cargo.toml
+++ b/tracker/agb-xm/Cargo.toml
@@ -19,4 +19,4 @@ proc-macro2 = "1"
 quote = "1"
 syn = "2"
 
-xmrs = "=0.8.1"
+xmrs = "=0.8.5"
diff --git a/tracker/desktop-player/Cargo.toml b/tracker/desktop-player/Cargo.toml
index 961782078..0a46bfd62 100644
--- a/tracker/desktop-player/Cargo.toml
+++ b/tracker/desktop-player/Cargo.toml
@@ -13,6 +13,6 @@ agb_tracker = { version = "0.21.1", path = "../agb-tracker", default-features =
 agb_fixnum = { version = "0.21.1", path = "../../agb-fixnum" }
 
 anyhow = "1"
-xmrs = "=0.8.1"
+xmrs = "=0.8.5"
 
 cpal = "0.15"