diff --git a/include/grpc++/impl/codegen/client_context.h b/include/grpc++/impl/codegen/client_context.h
index 156bdb82f702f36d46b614b7cbf3aaa87fe24ae4..72ed639b03c6711a1f8bdb1f1bbd75f09f6480ed 100644
--- a/include/grpc++/impl/codegen/client_context.h
+++ b/include/grpc++/impl/codegen/client_context.h
@@ -309,9 +309,7 @@ class ClientContext {
 
   // Should be used for framework-level extensions only.
   // Applications never need to call this method.
-  grpc_call* c_call() const {
-    return call_;
-  }
+  grpc_call* c_call() { return call_; }
 
  private:
   // Disallow copy and assign.
diff --git a/include/grpc++/impl/codegen/server_context.h b/include/grpc++/impl/codegen/server_context.h
index 82cb5a32ea1883a9ea588e49a764fd1e6564e390..c9d1f4d69e9d9df09ab920c6b9c5b1dcc5ea52e4 100644
--- a/include/grpc++/impl/codegen/server_context.h
+++ b/include/grpc++/impl/codegen/server_context.h
@@ -168,9 +168,7 @@ class ServerContext {
 
   // Should be used for framework-level extensions only.
   // Applications never need to call this method.
-  grpc_call* c_call() const {
-    return call_;
-  }
+  grpc_call* c_call() { return call_; }
 
  private:
   friend class ::grpc::testing::InteropServerContextInspector;
diff --git a/src/core/lib/security/context/security_context.h b/src/core/lib/security/context/security_context.h
index b2ffd4efc2efe4cc2d8f7d396bbbe3f4e53b763c..1e131a0c230dff7967b2530f6d42e3031734c4a5 100644
--- a/src/core/lib/security/context/security_context.h
+++ b/src/core/lib/security/context/security_context.h
@@ -84,6 +84,11 @@ void grpc_auth_context_unref(grpc_auth_context *policy);
 
 void grpc_auth_property_reset(grpc_auth_property *property);
 
+/* --- grpc_security_context_extension ---
+
+   Extension to the security context that may be set in a filter and accessed
+   later by a higher level method on a grpc_call object. */
+
 typedef struct {
   void *instance;
   void (*destroy)(void *);