diff --git a/rerun_cpp/src/rerun/archetypes/boxes3d_ext.cpp b/rerun_cpp/src/rerun/archetypes/boxes3d_ext.cpp
index 2d27cc73140f..0bedd996b0fa 100644
--- a/rerun_cpp/src/rerun/archetypes/boxes3d_ext.cpp
+++ b/rerun_cpp/src/rerun/archetypes/boxes3d_ext.cpp
@@ -30,6 +30,7 @@ namespace rerun {
         ///
         /// TODO(#3285): Does *not* preserve data as-is and instead creates half-sizes from the
         /// input data.
+        /// TODO(#3794): This should not take an std::vector.
         static Boxes3D from_sizes(const std::vector<datatypes::Vec3D>& sizes);
 
         /// Creates new `Boxes3D` with `centers` and `half_sizes` created from centers and (full)
@@ -37,6 +38,7 @@ namespace rerun {
         ///
         /// TODO(#3285): Does *not* preserve data as-is and instead creates centers and half-sizes
         /// from the input data.
+        /// TODO(#3794): This should not take an std::vector.
         static Boxes3D from_centers_and_sizes(
             ComponentBatch<components::Position3D> centers,
             const std::vector<datatypes::Vec3D>& sizes
@@ -51,6 +53,7 @@ namespace rerun {
         ///
         /// TODO(#3285): Does *not* preserve data as-is and instead creates centers and half-sizes
         /// from the input data.
+        /// TODO(#3794): This should not take an std::vector.
         static Boxes3D from_mins_and_sizes(
             const std::vector<datatypes::Vec3D>& mins, const std::vector<datatypes::Vec3D>& sizes
         );
diff --git a/rerun_cpp/src/rerun/component_batch.hpp b/rerun_cpp/src/rerun/component_batch.hpp
index 7a683ff4148e..b6614d109486 100644
--- a/rerun_cpp/src/rerun/component_batch.hpp
+++ b/rerun_cpp/src/rerun/component_batch.hpp
@@ -196,9 +196,7 @@ namespace rerun {
 
         /// Serializes the component batch into a rerun datacell that can be sent to a store.
         Result<SerializedComponentBatch> serialize() const {
-            // TODO(andreas): For improved error messages we should add a static_assert that
-            // TComponent implements `to_data_cell`.
-            // TODO(andreas): Invert this relationship - a user of this *container* should call
+            // TODO(#3794): Invert this relationship - a user of this *container* should call
             // TComponent::serialize (or similar) passing in this container.
             switch (ownership) {
                 case BatchOwnership::Borrowed: {