diff --git a/source/common/router/scoped_rds.cc b/source/common/router/scoped_rds.cc
index d863f9db6a5f5..133e91e313ddf 100644
--- a/source/common/router/scoped_rds.cc
+++ b/source/common/router/scoped_rds.cc
@@ -209,21 +209,19 @@ void ScopedRdsConfigSubscription::RdsRouteConfigProviderHelper::maybeInitRdsConf
 
   // Create a init_manager to create a rds provider.
   // No transitive warming dependency here because only on demand update reach this point.
-  std::unique_ptr<Init::ManagerImpl> srds_init_mgr =
-      std::make_unique<Init::ManagerImpl>(fmt::format("SRDS on demand init manager."));
-  std::unique_ptr<Cleanup> srds_initialization_continuation =
-      std::make_unique<Cleanup>([this, &srds_init_mgr] {
-        Init::WatcherImpl noop_watcher(
-            fmt::format("SRDS on demand ConfigUpdate watcher: {}", scope_name_),
-            []() { /*Do nothing.*/ });
-        srds_init_mgr->initialize(noop_watcher);
-      });
+  Init::ManagerImpl srds_init_mgr("SRDS on demand init manager.");
+  Cleanup srds_initialization_continuation([this, &srds_init_mgr] {
+    Init::WatcherImpl noop_watcher(
+        fmt::format("SRDS on demand ConfigUpdate watcher: {}", scope_name_),
+        []() { /*Do nothing.*/ });
+    srds_init_mgr.initialize(noop_watcher);
+  });
   // Create route provider.
   envoy::extensions::filters::network::http_connection_manager::v3::Rds rds;
   rds.mutable_config_source()->MergeFrom(parent_.rds_config_source_);
   rds.set_route_config_name(
       parent_.scoped_route_map_[scope_name_]->configProto().route_configuration_name());
-  initRdsConfigProvider(rds, *srds_init_mgr);
+  initRdsConfigProvider(rds, srds_init_mgr);
   ENVOY_LOG(debug, fmt::format("Scope on demand update: {}", scope_name_));
   // If RouteConfiguration hasn't been initialized, routeConfig() return a shared_ptr to
   // NullConfigImpl. The name of NullConfigImpl is an empty string.
diff --git a/source/common/upstream/conn_pool_map.h b/source/common/upstream/conn_pool_map.h
index 6b9891cc84f64..eae4f64c95d14 100644
--- a/source/common/upstream/conn_pool_map.h
+++ b/source/common/upstream/conn_pool_map.h
@@ -49,7 +49,7 @@ template <typename KEY_TYPE, typename POOL_TYPE> class ConnPoolMap {
   /**
    * @return true if the pools are empty.
    */
-  size_t empty() const;
+  bool empty() const;
 
   /**
    * Destroys all mapped pools.
diff --git a/source/common/upstream/conn_pool_map_impl.h b/source/common/upstream/conn_pool_map_impl.h
index 6df615ce013cf..1eebd6ec82f4f 100644
--- a/source/common/upstream/conn_pool_map_impl.h
+++ b/source/common/upstream/conn_pool_map_impl.h
@@ -81,7 +81,7 @@ size_t ConnPoolMap<KEY_TYPE, POOL_TYPE>::size() const {
 }
 
 template <typename KEY_TYPE, typename POOL_TYPE>
-size_t ConnPoolMap<KEY_TYPE, POOL_TYPE>::empty() const {
+bool ConnPoolMap<KEY_TYPE, POOL_TYPE>::empty() const {
   return active_pools_.empty();
 }
 
diff --git a/source/extensions/access_loggers/common/grpc_access_logger.h b/source/extensions/access_loggers/common/grpc_access_logger.h
index c6d06afbe8025..3cd627fcf7aed 100644
--- a/source/extensions/access_loggers/common/grpc_access_logger.h
+++ b/source/extensions/access_loggers/common/grpc_access_logger.h
@@ -172,7 +172,7 @@ class GrpcAccessLogger : public Detail::GrpcAccessLogger<HttpLogProto, TcpLogPro
     flush_timer_->enableTimer(buffer_flush_interval_msec_);
   }
 
-  void log(HttpLogProto&& entry) {
+  void log(HttpLogProto&& entry) override {
     if (!canLogMore()) {
       return;
     }
@@ -183,7 +183,7 @@ class GrpcAccessLogger : public Detail::GrpcAccessLogger<HttpLogProto, TcpLogPro
     }
   }
 
-  void log(TcpLogProto&& entry) {
+  void log(TcpLogProto&& entry) override {
     approximate_message_size_bytes_ += entry.ByteSizeLong();
     addEntry(std::move(entry));
     if (approximate_message_size_bytes_ >= max_buffer_size_bytes_) {