diff --git a/include/grpc++/call.h b/include/grpc++/call.h
index fe9175625d7..8d9412c9b6a 100644
--- a/include/grpc++/call.h
+++ b/include/grpc++/call.h
@@ -38,6 +38,7 @@
 #include <grpc++/completion_queue.h>
 
 #include <memory>
+#include <vector>
 
 namespace google {
 namespace protobuf {
diff --git a/include/grpc++/config.h b/include/grpc++/config.h
index 52913fbf0f9..1b4b463d359 100644
--- a/include/grpc++/config.h
+++ b/include/grpc++/config.h
@@ -39,6 +39,7 @@
 namespace grpc {
 
 typedef std::string string;
-}
+
+} // namespace grpc
 
 #endif  // __GRPCPP_CONFIG_H__
diff --git a/src/cpp/common/call.cc b/src/cpp/common/call.cc
index 6ae6c6cdb8d..9f8d9364b18 100644
--- a/src/cpp/common/call.cc
+++ b/src/cpp/common/call.cc
@@ -37,7 +37,7 @@
 namespace grpc {
 
 void Call::PerformOps(CallOpBuffer* buffer, void* tag) {
-  channel_->PerformOpsOnCall(buffer, tag, call_);
+  channel_->PerformOpsOnCall(buffer, tag, this);
 }
 
 }  // namespace grpc