diff --git a/include/grpcpp/impl/codegen/slice.h b/include/grpcpp/impl/codegen/slice.h
index 75c093d1da0..8966559dc85 100644
--- a/include/grpcpp/impl/codegen/slice.h
+++ b/include/grpcpp/impl/codegen/slice.h
@@ -138,10 +138,6 @@ inline grpc_slice SliceFromCopiedString(const grpc::string& str) {
                                                                  str.length());
 }
 
-inline grpc_slice SliceFromArray(const char* arr, size_t len) {
-  return g_core_codegen_interface->grpc_slice_from_copied_buffer(arr, len);
-}
-
 }  // namespace grpc
 
 #endif  // GRPCPP_IMPL_CODEGEN_SLICE_H
diff --git a/src/cpp/client/channel_cc.cc b/src/cpp/client/channel_cc.cc
index 510ae73478e..31c02893b11 100644
--- a/src/cpp/client/channel_cc.cc
+++ b/src/cpp/client/channel_cc.cc
@@ -65,6 +65,10 @@ Channel::~Channel() {
 
 namespace {
 
+inline grpc_slice SliceFromArray(const char* arr, size_t len) {
+  return g_core_codegen_interface->grpc_slice_from_copied_buffer(arr, len);
+}
+
 grpc::string GetChannelInfoField(grpc_channel* channel,
                                  grpc_channel_info* channel_info,
                                  char*** channel_info_field) {
@@ -112,7 +116,7 @@ internal::Call Channel::CreateCall(const internal::RpcMethod& method,
         method.channel_tag(), context->raw_deadline(), nullptr);
   } else {
     const string* host_str = nullptr;
-    if (!context->authority().empty()) {
+    if (!context->authority_.empty()) {
       host_str = &context->authority_;
     } else if (!host_.empty()) {
       host_str = &host_;