diff --git a/beacon_node/client/src/builder.rs b/beacon_node/client/src/builder.rs
index 215244b9b..e05b92a27 100644
--- a/beacon_node/client/src/builder.rs
+++ b/beacon_node/client/src/builder.rs
@@ -742,7 +742,7 @@ where
 
             runtime_context
                 .executor
-                .spawn_without_exit(async move { server.await }, "http-metrics");
+                .spawn_without_exit(server, "http-metrics");
 
             Some(listen_addr)
         } else {
diff --git a/beacon_node/http_metrics/tests/tests.rs b/beacon_node/http_metrics/tests/tests.rs
index 89fde3237..b88a790af 100644
--- a/beacon_node/http_metrics/tests/tests.rs
+++ b/beacon_node/http_metrics/tests/tests.rs
@@ -38,7 +38,7 @@ async fn returns_200_ok() {
         };
         let (listening_socket, server) = http_metrics::serve(ctx, server_shutdown).unwrap();
 
-        tokio::spawn(async { server.await });
+        tokio::spawn(server);
 
         let url = format!(
             "http://{}:{}/metrics",
diff --git a/beacon_node/lighthouse_network/src/discovery/subnet_predicate.rs b/beacon_node/lighthouse_network/src/discovery/subnet_predicate.rs
index e324532f7..f79ff8daf 100644
--- a/beacon_node/lighthouse_network/src/discovery/subnet_predicate.rs
+++ b/beacon_node/lighthouse_network/src/discovery/subnet_predicate.rs
@@ -1,4 +1,4 @@
-///! The subnet predicate used for searching for a particular subnet.
+//! The subnet predicate used for searching for a particular subnet.
 use super::*;
 use crate::types::{EnrAttestationBitfield, EnrSyncCommitteeBitfield};
 use slog::trace;
diff --git a/common/lru_cache/src/time.rs b/common/lru_cache/src/time.rs
index 7b8e9ba9a..966741ca4 100644
--- a/common/lru_cache/src/time.rs
+++ b/common/lru_cache/src/time.rs
@@ -1,4 +1,4 @@
-///! This implements a time-based LRU cache for fast checking of duplicates
+//! This implements a time-based LRU cache for fast checking of duplicates
 use fnv::FnvHashSet;
 use std::collections::VecDeque;
 use std::time::{Duration, Instant};
diff --git a/validator_client/src/lib.rs b/validator_client/src/lib.rs
index 3dde49f22..6e4a8da6a 100644
--- a/validator_client/src/lib.rs
+++ b/validator_client/src/lib.rs
@@ -146,7 +146,7 @@ impl<T: EthSpec> ProductionValidatorClient<T> {
             context
                 .clone()
                 .executor
-                .spawn_without_exit(async move { server.await }, "metrics-api");
+                .spawn_without_exit(server, "metrics-api");
 
             Some(ctx)
         } else {
@@ -590,7 +590,7 @@ impl<T: EthSpec> ProductionValidatorClient<T> {
             self.context
                 .clone()
                 .executor
-                .spawn_without_exit(async move { server.await }, "http-api");
+                .spawn_without_exit(server, "http-api");
 
             Some(listen_addr)
         } else {