diff --git a/source/common/router/config_impl.cc b/source/common/router/config_impl.cc
index 6e866752065d6..2fb37866e8b5e 100644
--- a/source/common/router/config_impl.cc
+++ b/source/common/router/config_impl.cc
@@ -876,7 +876,8 @@ ConfigImpl::ConfigImpl(const envoy::api::v2::RouteConfiguration& config, Runtime
                                                      config.response_headers_to_remove());
 }
 
-PerFilterConfigs::PerFilterConfigs(const Protobuf::Map<std::string, ProtobufWkt::Struct>& configs) {
+PerFilterConfigs::PerFilterConfigs(
+    const Protobuf::Map<ProtobufTypes::String, ProtobufWkt::Struct>& configs) {
   for (const auto& cfg : configs) {
     const std::string& name = cfg.first;
     const ProtobufWkt::Struct& struct_config = cfg.second;
diff --git a/source/common/router/config_impl.h b/source/common/router/config_impl.h
index 4d93122e8ea4d..6640dea9b6e0a 100644
--- a/source/common/router/config_impl.h
+++ b/source/common/router/config_impl.h
@@ -46,7 +46,7 @@ class Matchable {
 
 class PerFilterConfigs {
 public:
-  PerFilterConfigs(const Protobuf::Map<std::string, ProtobufWkt::Struct>& configs);
+  PerFilterConfigs(const Protobuf::Map<ProtobufTypes::String, ProtobufWkt::Struct>& configs);
 
   const RouteSpecificFilterConfig* get(const std::string& name) const;
 
diff --git a/source/common/upstream/health_checker_impl.cc b/source/common/upstream/health_checker_impl.cc
index c06903f8cc2e8..2aa88a44c6151 100644
--- a/source/common/upstream/health_checker_impl.cc
+++ b/source/common/upstream/health_checker_impl.cc
@@ -63,7 +63,7 @@ HealthCheckerFactory::create(const envoy::api::v2::core::HealthCheck& hc_config,
         Config::Utility::getAndCheckFactory<Server::Configuration::CustomHealthCheckerFactory>(
             hc_config.has_redis_health_check()
                 ? Extensions::HealthCheckers::HealthCheckerNames::get().REDIS_HEALTH_CHECKER
-                : hc_config.custom_health_check().name());
+                : std::string(hc_config.custom_health_check().name()));
     std::unique_ptr<Server::Configuration::HealthCheckerFactoryContext> context(
         new HealthCheckerFactoryContextImpl(cluster, runtime, random, dispatcher));
     return factory.createCustomHealthChecker(hc_config, *context);