diff --git a/illumos-utils/src/lib.rs b/illumos-utils/src/lib.rs
index c882f258c9..3b696d178b 100644
--- a/illumos-utils/src/lib.rs
+++ b/illumos-utils/src/lib.rs
@@ -4,6 +4,7 @@
 
 //! Wrappers around illumos-specific commands.
 
+#[allow(unused)]
 use std::sync::atomic::{AtomicBool, Ordering};
 
 use cfg_if::cfg_if;
diff --git a/nexus/src/app/background/common.rs b/nexus/src/app/background/common.rs
index 3fcf0483a5..b5291cf93c 100644
--- a/nexus/src/app/background/common.rs
+++ b/nexus/src/app/background/common.rs
@@ -177,7 +177,7 @@ pub struct Driver {
 ///
 /// This is returned by [`Driver::register()`] to identify the corresponding
 /// background task.  It's then accepted by functions like
-/// [`Driver::activate()`] and [`Driver::status()`] to identify the task.
+/// [`Driver::activate()`] and [`Driver::task_status()`] to identify the task.
 #[derive(Clone, Debug, Ord, PartialOrd, PartialEq, Eq)]
 pub struct TaskHandle(String);
 
@@ -277,7 +277,7 @@ impl Driver {
     /// Enumerate all registered background tasks
     ///
     /// This is aimed at callers that want to get the status of all background
-    /// tasks.  You'd call [`Driver::status()`] with each of the items produced
+    /// tasks.  You'd call [`Driver::task_status()`] with each of the items produced
     /// by the iterator.
     pub fn tasks(&self) -> impl Iterator<Item = &TaskHandle> {
         self.tasks.keys()
diff --git a/sled-agent/src/services.rs b/sled-agent/src/services.rs
index c692cca309..384a745285 100644
--- a/sled-agent/src/services.rs
+++ b/sled-agent/src/services.rs
@@ -5,7 +5,7 @@
 //! Sled-local service management.
 //!
 //! For controlling zone-based storage services, refer to
-//! [sled_storage:manager::StorageManager].
+//! [sled_storage::manager::StorageManager].
 //!
 //! For controlling virtual machine instances, refer to
 //! [crate::instance_manager::InstanceManager].
diff --git a/sled-agent/src/storage_monitor.rs b/sled-agent/src/storage_monitor.rs
index da9f6b4897..1a98a54f25 100644
--- a/sled-agent/src/storage_monitor.rs
+++ b/sled-agent/src/storage_monitor.rs
@@ -2,7 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//! A task that listens for storage events from [`sled_storage::StorageMonitor`]
+//! A task that listens for storage events from [`sled_storage::manager::StorageManager`]
 //! and dispatches them to other parst of the bootstrap agent and sled agent
 //! code.
 
diff --git a/sled-hardware/src/disk.rs b/sled-hardware/src/disk.rs
index aeaca9dc31..44658658be 100644
--- a/sled-hardware/src/disk.rs
+++ b/sled-hardware/src/disk.rs
@@ -118,9 +118,9 @@ impl DiskPaths {
 /// A disk which has been observed by monitoring hardware.
 ///
 /// No guarantees are made about the partitions which exist within this disk.
-/// This exists as a distinct entity from [Disk] because it may be desirable to
-/// monitor for hardware in one context, and conform disks to partition layouts
-/// in a different context.
+/// This exists as a distinct entity from `Disk` in `sled-storage` because it
+/// may be desirable to monitor for hardware in one context, and conform disks
+/// to partition layouts in a different context.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct UnparsedDisk {
     paths: DiskPaths,
diff --git a/sled-storage/src/resources.rs b/sled-storage/src/resources.rs
index 51fd3ae222..07c46e1265 100644
--- a/sled-storage/src/resources.rs
+++ b/sled-storage/src/resources.rs
@@ -23,9 +23,9 @@ const ZONE_BUNDLE_DIRECTORY: &str = "zone";
 
 /// Storage related resources: disks and zpools
 ///
-/// This state is internal to the [`crate::StorageManager`] task. Clones
+/// This state is internal to the [`crate::manager::StorageManager`] task. Clones
 /// of this state can be retrieved by requests to the `StorageManager` task
-/// from the [`crate::StorageManagerHandle`]. This state is not `Sync`, and
+/// from the [`crate::manager::StorageHandle`]. This state is not `Sync`, and
 /// as such does not require any mutexes. However, we do expect to share it
 /// relatively frequently, and we want copies of it to be as cheaply made
 /// as possible. So any large state is stored inside `Arc`s. On the other
diff --git a/wicketd/src/artifacts/extracted_artifacts.rs b/wicketd/src/artifacts/extracted_artifacts.rs
index 352d8ad3d5..b796201936 100644
--- a/wicketd/src/artifacts/extracted_artifacts.rs
+++ b/wicketd/src/artifacts/extracted_artifacts.rs
@@ -169,7 +169,7 @@ impl ExtractedArtifacts {
     ///
     /// As the returned file is written to, the data will be hashed; once
     /// writing is complete, call [`ExtractedArtifacts::store_tempfile()`] to
-    /// persist the temporary file into an [`ExtractedArtifactDataHandle()`].
+    /// persist the temporary file into an [`ExtractedArtifactDataHandle`].
     pub(super) fn new_tempfile(
         &self,
     ) -> Result<HashingNamedUtf8TempFile, RepositoryError> {