diff --git a/src/auth/mod.rs b/src/auth/mod.rs
index 41e62f48395c..4647d56b0a21 100644
--- a/src/auth/mod.rs
+++ b/src/auth/mod.rs
@@ -88,7 +88,7 @@ mod tests {
         let token = create_token(
             perms_expected.clone(),
             key.private_key(),
-            Duration::try_hours(1).expect("Infallible"),
+            Duration::hours(1),
         )
         .unwrap();
         let perms = verify_token(&token, key.private_key()).unwrap();
@@ -98,7 +98,7 @@ mod tests {
         let token = create_token(
             perms_expected.clone(),
             key.private_key(),
-            -Duration::try_hours(1).expect("Infallible"),
+            -Duration::hours(1),
         )
         .unwrap();
         assert!(verify_token(&token, key.private_key()).is_err());
@@ -108,7 +108,7 @@ mod tests {
         let token = create_token(
             perms_expected.clone(),
             key.private_key(),
-            -Duration::try_seconds(10).expect("Infallible"),
+            -Duration::seconds(10),
         )
         .unwrap();
         let perms = verify_token(&token, key.private_key()).unwrap();
@@ -138,7 +138,7 @@ mod tests {
         let token = create_token(
             perms_expected.clone(),
             key.private_key(),
-            -Duration::try_hours(1).expect("Infallible"),
+            -Duration::hours(1),
         )
         .unwrap();
         let perms = verify_token(&token, key.private_key()).unwrap();
diff --git a/src/chain/store/index.rs b/src/chain/store/index.rs
index 65c8d80fa582..2d8febeb00d6 100644
--- a/src/chain/store/index.rs
+++ b/src/chain/store/index.rs
@@ -130,7 +130,7 @@ impl<DB: Blockstore> ChainIndex<DB> {
             SizeTrackingLruCache::new_with_metrics(
                 "tipset_by_height".into(),
                 // 20480 * 900 = 18432000 which is sufficient for mainnet
-                20480.try_into().expect("infallible"),
+                nonzero!(20480_usize),
             )
         });
 
diff --git a/src/chain_sync/network_context.rs b/src/chain_sync/network_context.rs
index 8366a76f8d9a..5bd8debe51d6 100644
--- a/src/chain_sync/network_context.rs
+++ b/src/chain_sync/network_context.rs
@@ -28,6 +28,7 @@ use crate::{
 };
 use anyhow::Context as _;
 use fvm_ipld_blockstore::Blockstore;
+use nonzero_ext::nonzero;
 use parking_lot::Mutex;
 use std::future::Future;
 use tokio::sync::Semaphore;
@@ -152,13 +153,7 @@ where
         ts: &Tipset,
     ) -> Result<FullTipset, String> {
         let mut bundles: Vec<TipsetBundle> = self
-            .handle_chain_exchange_request(
-                peer_id,
-                ts.key(),
-                NonZeroU64::new(1).expect("Infallible"),
-                MESSAGES,
-                |_| true,
-            )
+            .handle_chain_exchange_request(peer_id, ts.key(), nonzero!(1_u64), MESSAGES, |_| true)
             .await?;
 
         if bundles.len() != 1 {
@@ -184,7 +179,7 @@ where
             .handle_chain_exchange_request(
                 peer_id,
                 tsk,
-                NonZeroU64::new(1).expect("Infallible"),
+                nonzero!(1_u64),
                 HEADERS | MESSAGES,
                 |_| true,
             )
@@ -207,7 +202,7 @@ where
         self.handle_chain_exchange_request(
             peer_id,
             tsk,
-            NonZeroU64::new(16).expect("Infallible"),
+            nonzero!(16_u64),
             HEADERS | MESSAGES,
             |_| true,
         )
diff --git a/src/rpc/methods/f3.rs b/src/rpc/methods/f3.rs
index becdeeb5d892..8991299606e9 100644
--- a/src/rpc/methods/f3.rs
+++ b/src/rpc/methods/f3.rs
@@ -41,8 +41,10 @@ use enumflags2::BitFlags;
 use fvm_ipld_blockstore::Blockstore;
 use jsonrpsee::core::{client::ClientT as _, params::ArrayParams};
 use libp2p::PeerId;
+use nonzero_ext::nonzero;
 use num::Signed as _;
 use parking_lot::RwLock;
+use std::num::NonZeroUsize;
 use std::{
     borrow::Cow,
     fmt::Display,
@@ -166,12 +168,9 @@ impl GetPowerTable {
         ts: &Tipset,
     ) -> anyhow::Result<Vec<F3PowerEntry>> {
         // The RAM overhead on mainnet is ~14MiB
-        const BLOCKSTORE_CACHE_CAP: usize = 65536;
+        const BLOCKSTORE_CACHE_CAP: NonZeroUsize = nonzero!(65536_usize);
         static BLOCKSTORE_CACHE: LazyLock<LruBlockstoreReadCache> = LazyLock::new(|| {
-            LruBlockstoreReadCache::new_with_metrics(
-                "get_powertable".into(),
-                BLOCKSTORE_CACHE_CAP.try_into().expect("Infallible"),
-            )
+            LruBlockstoreReadCache::new_with_metrics("get_powertable".into(), BLOCKSTORE_CACHE_CAP)
         });
         let db = BlockstoreWithReadCache::new(
             ctx.store_owned(),
@@ -531,7 +530,7 @@ impl RpcMethod<1> for Finalize {
             Some(ts) => ts,
             None => ctx
                 .sync_network_context
-                .chain_exchange_headers(None, &tsk, 1.try_into().expect("Infallible"))
+                .chain_exchange_headers(None, &tsk, nonzero!(1_u64))
                 .await?
                 .first()
                 .cloned()