diff --git a/src/pbd.rs b/src/pbd.rs
index 691c372..4effd12 100644
--- a/src/pbd.rs
+++ b/src/pbd.rs
@@ -95,7 +95,7 @@ impl PreBoneDeformer {
     /// Reads an existing PBD file
     pub fn from_existing(buffer: ByteSpan) -> Option<PreBoneDeformer> {
         let mut cursor = Cursor::new(buffer);
-        let mut header = PreBoneDeformerHeader::read(&mut cursor).unwrap();
+        let mut header = PreBoneDeformerHeader::read(&mut cursor).ok()?;
 
         Some(PreBoneDeformer { header })
     }
diff --git a/src/repository.rs b/src/repository.rs
index fae1fca..f2828eb 100755
--- a/src/repository.rs
+++ b/src/repository.rs
@@ -242,10 +242,10 @@ mod tests {
             version: None,
         };
 
-        assert_eq!(repo.index_filename(Category::Music), "0c0000.win32.index");
-        assert_eq!(repo.index2_filename(Category::Music), "0c0000.win32.index2");
+        assert_eq!(repo.index_filename(0, Category::Music), "0c0000.win32.index");
+        assert_eq!(repo.index2_filename(0, Category::Music), "0c0000.win32.index2");
         assert_eq!(
-            repo.dat_filename(Category::GameScript, 1),
+            repo.dat_filename(0, Category::GameScript, 1),
             "0b0000.win32.dat1"
         );
     }
@@ -260,10 +260,10 @@ mod tests {
             version: None,
         };
 
-        assert_eq!(repo.index_filename(Category::Music), "0c0000.ps3.index");
-        assert_eq!(repo.index2_filename(Category::Music), "0c0000.ps3.index2");
+        assert_eq!(repo.index_filename(0, Category::Music), "0c0000.ps3.index");
+        assert_eq!(repo.index2_filename(0, Category::Music), "0c0000.ps3.index2");
         assert_eq!(
-            repo.dat_filename(Category::GameScript, 1),
+            repo.dat_filename(0, Category::GameScript, 1),
             "0b0000.ps3.dat1"
         );
     }
@@ -277,10 +277,10 @@ mod tests {
             version: None,
         };
 
-        assert_eq!(repo.index_filename(Category::Music), "0c0000.ps4.index");
-        assert_eq!(repo.index2_filename(Category::Music), "0c0000.ps4.index2");
+        assert_eq!(repo.index_filename(0, Category::Music), "0c0000.ps4.index");
+        assert_eq!(repo.index2_filename(0, Category::Music), "0c0000.ps4.index2");
         assert_eq!(
-            repo.dat_filename(Category::GameScript, 1),
+            repo.dat_filename(0, Category::GameScript, 1),
             "0b0000.ps4.dat1"
         );
     }