diff --git a/core/src/local_vote_signer_service.rs b/core/src/local_vote_signer_service.rs
index e9d9f3343..b62760175 100644
--- a/core/src/local_vote_signer_service.rs
+++ b/core/src/local_vote_signer_service.rs
@@ -15,10 +15,9 @@ pub struct LocalVoteSignerService {
 impl LocalVoteSignerService {
     #[allow(clippy::new_ret_no_self)]
     pub fn new(port_range: PortRange) -> (Self, SocketAddr) {
-        let addr = match solana_net_utils::find_available_port_in_range(port_range) {
-            Ok(port) => SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), port),
-            Err(_e) => panic!("Failed to find an available port for local vote signer service"),
-        };
+        let addr = solana_net_utils::find_available_port_in_range(port_range)
+            .map(|port| SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), port))
+            .expect("Failed to find an available port for local vote signer service");
         let exit = Arc::new(AtomicBool::new(false));
         let thread_exit = exit.clone();
         let thread = Builder::new()
diff --git a/ledger/src/sigverify_shreds.rs b/ledger/src/sigverify_shreds.rs
index 741af58e2..1eec929cd 100644
--- a/ledger/src/sigverify_shreds.rs
+++ b/ledger/src/sigverify_shreds.rs
@@ -137,7 +137,7 @@ fn slot_key_data_for_gpu<
     let keyvec_size = keys_to_slots.len() * size_of::<T>();
     keyvec.resize(keyvec_size, 0);
 
-    for (i, (k, slots)) in keys_to_slots.iter_mut().enumerate() {
+    for (i, (k, slots)) in keys_to_slots.iter().enumerate() {
         let start = i * size_of::<T>();
         let end = start + size_of::<T>();
         keyvec[start..end].copy_from_slice(k.as_ref());