diff --git a/src/core/lib/gprpp/optional.h b/src/core/lib/gprpp/optional.h
index 593ef08c317..e517c6edccc 100644
--- a/src/core/lib/gprpp/optional.h
+++ b/src/core/lib/gprpp/optional.h
@@ -36,6 +36,8 @@ class Optional {
   void reset() { set_ = false; }
 
   T value() { return value_; }
+
+ private:
   T value_;
   bool set_ = false;
 };
diff --git a/src/core/lib/iomgr/buffer_list.h b/src/core/lib/iomgr/buffer_list.h
index fd310fabe51..215ab03a563 100644
--- a/src/core/lib/iomgr/buffer_list.h
+++ b/src/core/lib/iomgr/buffer_list.h
@@ -36,7 +36,7 @@ struct ConnectionMetrics {
   /* Delivery rate in Bytes/s. */
   Optional<uint64_t> delivery_rate;
   /* If the delivery rate is limited by the application, this is set to true. */
-  Optional<uint64_t> is_delivery_rate_app_limited;
+  Optional<bool> is_delivery_rate_app_limited;
   /* Total packets retransmitted. */
   Optional<uint32_t> packet_retx;
   /* Total packets retransmitted spuriously. This metric is smaller than or