diff --git a/src/main/java/land/chipmunk/chipmunkmod/song/NBSConverter.java b/src/main/java/land/chipmunk/chipmunkmod/song/NBSConverter.java
index 960f5f6..bb5913b 100644
--- a/src/main/java/land/chipmunk/chipmunkmod/song/NBSConverter.java
+++ b/src/main/java/land/chipmunk/chipmunkmod/song/NBSConverter.java
@@ -78,9 +78,9 @@ public class NBSConverter {
         }
 
         final ArrayList<NBSNote> nbsNotes = new ArrayList<>();
-        short tick = -1;
+        int tick = -1;
         while (true) {
-            final int tickJumps = buffer.getShort();
+            final int tickJumps = Short.toUnsignedInt(buffer.getShort());
             if (tickJumps == 0) break;
             tick += tickJumps;
 
@@ -231,6 +231,7 @@ public class NBSConverter {
             String sound = Util.sanitizeName(path, Identifier::isAllowedInIdentifier)
                 .replaceFirst("\\.ogg$", "")
                 .replaceFirst("^minecraft/", "")
+                .replaceFirst("\\d+$", "")
                 .replace('/', '.');
 
             // if there's no path, it's probably a note block sound