diff --git a/include/grpc/grpc_security.h b/include/grpc/grpc_security.h
index 42e2ab31117c0..95b14479354dd 100644
--- a/include/grpc/grpc_security.h
+++ b/include/grpc/grpc_security.h
@@ -249,7 +249,7 @@ typedef struct {
   void *reserved;
 } grpc_auth_metadata_context;
 
-/** Maximum number of credentials returnable by a credentials plugin via
+/** Maximum number of metadata entries returnable by a credentials plugin via
     a synchronous return. */
 #define GRPC_METADATA_CREDENTIALS_PLUGIN_SYNC_MAX 4
 
diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc
index 6c06e453263d7..e2bd1f7747e54 100644
--- a/src/cpp/client/secure_credentials.cc
+++ b/src/cpp/client/secure_credentials.cc
@@ -178,12 +178,12 @@ int MetadataCredentialsPluginWrapper::GetMetadata(
     w->thread_pool_->Add(
         std::bind(&MetadataCredentialsPluginWrapper::InvokePlugin, w, context,
                   cb, user_data, nullptr, nullptr, nullptr, nullptr));
-    return false;
+    return 0;
   } else {
     // Synchronous return.
     w->InvokePlugin(context, cb, user_data, creds_md, num_creds_md, status,
                     error_details);
-    return true;
+    return 1;
   }
 }