diff --git a/rust/vecsim/src/distance/simd/avx.rs b/rust/vecsim/src/distance/simd/avx.rs
index 5c168db28..ed17a9305 100644
--- a/rust/vecsim/src/distance/simd/avx.rs
+++ b/rust/vecsim/src/distance/simd/avx.rs
@@ -8,7 +8,7 @@
 
 #![cfg(target_arch = "x86_64")]
 
-use crate::types::VectorElement;
+use crate::types::{DistanceType, VectorElement};
 
 #[cfg(target_arch = "x86_64")]
 use std::arch::x86_64::*;
diff --git a/rust/vecsim/src/distance/simd/avx2.rs b/rust/vecsim/src/distance/simd/avx2.rs
index 3f66550ea..0e4fc0c91 100644
--- a/rust/vecsim/src/distance/simd/avx2.rs
+++ b/rust/vecsim/src/distance/simd/avx2.rs
@@ -5,7 +5,7 @@
 
 #![cfg(target_arch = "x86_64")]
 
-use crate::types::VectorElement;
+use crate::types::{DistanceType, VectorElement};
 
 #[cfg(target_arch = "x86_64")]
 use std::arch::x86_64::*;
diff --git a/rust/vecsim/src/distance/simd/avx512.rs b/rust/vecsim/src/distance/simd/avx512.rs
index eeef9559b..d0d0dd8f4 100644
--- a/rust/vecsim/src/distance/simd/avx512.rs
+++ b/rust/vecsim/src/distance/simd/avx512.rs
@@ -5,7 +5,7 @@
 
 #![cfg(target_arch = "x86_64")]
 
-use crate::types::VectorElement;
+use crate::types::{DistanceType, VectorElement};
 
 #[cfg(target_arch = "x86_64")]
 use std::arch::x86_64::*;
diff --git a/rust/vecsim/src/distance/simd/avx512bw.rs b/rust/vecsim/src/distance/simd/avx512bw.rs
index b7a38fb5f..1936c2a98 100644
--- a/rust/vecsim/src/distance/simd/avx512bw.rs
+++ b/rust/vecsim/src/distance/simd/avx512bw.rs
@@ -10,7 +10,7 @@
 
 #![cfg(target_arch = "x86_64")]
 
-use crate::types::{Int8, UInt8, VectorElement};
+use crate::types::{DistanceType, Int8, UInt8, VectorElement};
 
 #[cfg(target_arch = "x86_64")]
 use std::arch::x86_64::*;
diff --git a/rust/vecsim/src/distance/simd/cross_consistency_tests.rs b/rust/vecsim/src/distance/simd/cross_consistency_tests.rs
index 10b3359bd..387ff69a4 100644
--- a/rust/vecsim/src/distance/simd/cross_consistency_tests.rs
+++ b/rust/vecsim/src/distance/simd/cross_consistency_tests.rs
@@ -154,7 +154,7 @@ mod x86_64_tests {
 
                 let scalar_result = cosine_distance_scalar_f32(&a, &b, dim);
                 let simd_result = unsafe {
-                    crate::distance::simd::sse::cosine_distance_f32_sse(
+                    crate::distance::simd::sse::cosine_f32_sse(
                         a.as_ptr(), b.as_ptr(), dim
                     )
                 };
@@ -606,7 +606,7 @@ mod x86_64_tests {
 
         if is_x86_feature_detected!("sse") {
             let sse_cos = unsafe {
-                crate::distance::simd::sse::cosine_distance_f32_sse(a.as_ptr(), b.as_ptr(), dim)
+                crate::distance::simd::sse::cosine_f32_sse(a.as_ptr(), b.as_ptr(), dim)
             };
             assert!((sse_cos - 1.0).abs() < 0.01, "SSE cosine of orthogonal vectors should be ~1.0, got {}", sse_cos);
         }
@@ -631,7 +631,7 @@ mod x86_64_tests {
 
         if is_x86_feature_detected!("sse") {
             let sse_cos = unsafe {
-                crate::distance::simd::sse::cosine_distance_f32_sse(a.as_ptr(), b.as_ptr(), dim)
+                crate::distance::simd::sse::cosine_f32_sse(a.as_ptr(), b.as_ptr(), dim)
             };
             assert!((sse_cos - 2.0).abs() < 0.01, "SSE cosine of opposite vectors should be ~2.0, got {}", sse_cos);
         }
@@ -662,7 +662,7 @@ mod x86_64_tests {
             unsafe {
                 results_l2.push(("sse", crate::distance::simd::sse::l2_squared_f32_sse(a.as_ptr(), b.as_ptr(), dim)));
                 results_ip.push(("sse", crate::distance::simd::sse::inner_product_f32_sse(a.as_ptr(), b.as_ptr(), dim)));
-                results_cos.push(("sse", crate::distance::simd::sse::cosine_distance_f32_sse(a.as_ptr(), b.as_ptr(), dim)));
+                results_cos.push(("sse", crate::distance::simd::sse::cosine_f32_sse(a.as_ptr(), b.as_ptr(), dim)));
             }
         }
 
diff --git a/rust/vecsim/src/distance/simd/sse.rs b/rust/vecsim/src/distance/simd/sse.rs
index 850d5f841..0c6d60ad6 100644
--- a/rust/vecsim/src/distance/simd/sse.rs
+++ b/rust/vecsim/src/distance/simd/sse.rs
@@ -5,7 +5,7 @@
 
 #![cfg(target_arch = "x86_64")]
 
-use crate::types::VectorElement;
+use crate::types::{DistanceType, VectorElement};
 
 #[cfg(target_arch = "x86_64")]
 use std::arch::x86_64::*;
diff --git a/rust/vecsim/src/distance/simd/sse4.rs b/rust/vecsim/src/distance/simd/sse4.rs
index f5bef2c79..d8c2a9c09 100644
--- a/rust/vecsim/src/distance/simd/sse4.rs
+++ b/rust/vecsim/src/distance/simd/sse4.rs
@@ -7,7 +7,7 @@
 
 #![cfg(target_arch = "x86_64")]
 
-use crate::types::VectorElement;
+use crate::types::{DistanceType, VectorElement};
 
 #[cfg(target_arch = "x86_64")]
 use std::arch::x86_64::*;
diff --git a/rust/vecsim/src/index/hnsw/visited.rs b/rust/vecsim/src/index/hnsw/visited.rs
index ad278c7f4..ccc6c3172 100644
--- a/rust/vecsim/src/index/hnsw/visited.rs
+++ b/rust/vecsim/src/index/hnsw/visited.rs
@@ -105,7 +105,7 @@ impl VisitedNodesHandlerPool {
     }
 
     /// Get a handler from the pool, creating one if necessary.
-    pub fn get(&self) -> PooledHandler {
+    pub fn get(&self) -> PooledHandler<'_> {
         let cap = self.default_capacity.load(std::sync::atomic::Ordering::Acquire);
         let handler = self.handlers.lock().pop().unwrap_or_else(|| {
             VisitedNodesHandler::new(cap)