diff --git a/include/grpc++/test/server_context_test_spouse.h b/include/grpc++/test/server_context_test_spouse.h
index 4cb84e77c19115f412d408e5213dd4a98e53eefd..bac0db7bdc5c3f92cf1d8a2fb324c99b7ad87c76 100644
--- a/include/grpc++/test/server_context_test_spouse.h
+++ b/include/grpc++/test/server_context_test_spouse.h
@@ -55,8 +55,9 @@ class ServerContextTestSpouse {
     for (auto iter = client_metadata_storage_.begin();
          iter != client_metadata_storage_.end(); ++iter) {
       ctx_->client_metadata_.map()->insert(
-          std::pair<grpc::string_ref, grpc::string_ref>(iter->first.c_str(),
-                                                        iter->second.c_str()));
+          std::pair<grpc::string_ref, grpc::string_ref>(
+              iter->first.c_str(),
+              grpc::string_ref(iter->second.data(), iter->second.size())));
     }
   }
 
diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h
index b70343ddf18a75551a00edff454ced8e37068e46..7d4d0db28d999282940d236e87703e95cdbf8211 100644
--- a/src/core/lib/surface/call.h
+++ b/src/core/lib/surface/call.h
@@ -110,6 +110,7 @@ void grpc_call_log_batch(char *file, int line, gpr_log_severity severity,
 
 /* Set a context pointer.
    No thread safety guarantees are made wrt this value. */
+/* TODO(#9731): add exec_ctx to destroy */
 void grpc_call_context_set(grpc_call *call, grpc_context_index elem,
                            void *value, void (*destroy)(void *value));
 /* Get a context pointer. */