diff --git a/include/grpc++/server.h b/include/grpc++/server.h
index a580a246328bf259a6747f0aa6ca42733568739b..b80835118167c077c63e3c5744419c836cb002c8 100644
--- a/include/grpc++/server.h
+++ b/include/grpc++/server.h
@@ -70,6 +70,8 @@ class Server GRPC_FINAL : private CallHook,
   // function to ever return)
   void Wait();
 
+  CompletionQueue* cq() { return &cq_; }
+
  private:
   friend class AnonymousService;
   friend class ServerBuilder;
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index d8425f1dfcb6c77ea5398940cf162cc9e9f8118e..4328b2c07501c9c447cd9cdb8465608c4c343f86 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -355,10 +355,8 @@ class Server::AsyncRequest GRPC_FINAL : public CompletionQueueTag {
                 array_.metadata[i].value + array_.metadata[i].value_length)));
       }
       if (anonymous_ctx_) {
-        anonymous_ctx_->method_.assign(call_details_.method,
-                                       call_details_.method_capacity);
-        anonymous_ctx_->host_.assign(call_details_.host,
-                                     call_details_.host_capacity);
+        anonymous_ctx_->method_ = call_details_.method;
+        anonymous_ctx_->host_ = call_details_.host;
       }
     }
     ctx->call_ = call_;