diff --git a/include/grpc++/impl/service_type.h b/include/grpc++/impl/service_type.h
index cac2be30aba..fde5962107a 100644
--- a/include/grpc++/impl/service_type.h
+++ b/include/grpc++/impl/service_type.h
@@ -82,7 +82,7 @@ class AsynchronousService {
                       size_t method_count)
       : cq_(cq), method_names_(method_names), method_count_(method_count) {}
 
-  ~AsynchronousService();
+  ~AsynchronousService() { delete[] request_args_; }
 
   CompletionQueue* completion_queue() const { return cq_; }
 
@@ -125,4 +125,4 @@ class AsynchronousService {
 
 }  // namespace grpc
 
-#endif  // __GRPCPP_IMPL_SERVICE_TYPE_H__
\ No newline at end of file
+#endif  // __GRPCPP_IMPL_SERVICE_TYPE_H__
diff --git a/include/grpc++/server_context.h b/include/grpc++/server_context.h
index fcca85594a1..64091a4505d 100644
--- a/include/grpc++/server_context.h
+++ b/include/grpc++/server_context.h
@@ -49,6 +49,8 @@ template <class R>
 class ServerAsyncReader;
 template <class W>
 class ServerAsyncWriter;
+template <class W>
+class ServerAsyncResponseWriter;
 template <class R, class W>
 class ServerAsyncReaderWriter;
 template <class R>
@@ -80,6 +82,8 @@ class ServerContext final {
   friend class ::grpc::ServerAsyncReader;
   template <class W>
   friend class ::grpc::ServerAsyncWriter;
+  template <class W>
+  friend class ::grpc::ServerAsyncResponseWriter;
   template <class R, class W>
   friend class ::grpc::ServerAsyncReaderWriter;
   template <class R>
diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc
index 9e02ac5a3c5..21a61af3a04 100644
--- a/src/cpp/server/server_context.cc
+++ b/src/cpp/server/server_context.cc
@@ -38,6 +38,8 @@
 
 namespace grpc {
 
+ServerContext::ServerContext() {}
+
 ServerContext::ServerContext(gpr_timespec deadline, grpc_metadata *metadata,
                              size_t metadata_count)
     : deadline_(Timespec2Timepoint(deadline)) {