diff --git a/infrastructure/ssz/src/main/java/tech/pegasys/teku/infrastructure/ssz/schema/SszCollectionSchema.java b/infrastructure/ssz/src/main/java/tech/pegasys/teku/infrastructure/ssz/schema/SszCollectionSchema.java
index 4484373b73c..9b04c382f48 100644
--- a/infrastructure/ssz/src/main/java/tech/pegasys/teku/infrastructure/ssz/schema/SszCollectionSchema.java
+++ b/infrastructure/ssz/src/main/java/tech/pegasys/teku/infrastructure/ssz/schema/SszCollectionSchema.java
@@ -49,6 +49,7 @@ default SszCollectionT createFromElements(final List<? extends SszElementT> elem
   }
 
   default TreeNode createTreeFromElements(final List<? extends SszElementT> elements) {
+    // https://github.com/Consensys/teku/issues/9035
     // This is a generic implementation which works for both Vector and List but it potentially
     // could do better if construct the tree directly in List/Vector subclasses
     checkArgument(elements.size() <= getMaxLength(), "Too many elements for this collection type");
diff --git a/networking/p2p/src/main/java/tech/pegasys/teku/networking/p2p/libp2p/LibP2PNetworkBuilder.java b/networking/p2p/src/main/java/tech/pegasys/teku/networking/p2p/libp2p/LibP2PNetworkBuilder.java
index 10a79d33644..eb9d1c0df68 100644
--- a/networking/p2p/src/main/java/tech/pegasys/teku/networking/p2p/libp2p/LibP2PNetworkBuilder.java
+++ b/networking/p2p/src/main/java/tech/pegasys/teku/networking/p2p/libp2p/LibP2PNetworkBuilder.java
@@ -217,7 +217,9 @@ protected Host createHost(final PrivKey privKey, final List<Multiaddr> advertise
 
           // Yamux must take precedence during negotiation
           if (config.isYamuxEnabled()) {
-            b.getMuxers().add(StreamMuxerProtocol.getYamux());
+            // https://github.com/Consensys/teku/issues/7532
+            final int maxBufferedConnectionWrites = 150 * 1024 * 1024;
+            b.getMuxers().add(StreamMuxerProtocol.getYamux(maxBufferedConnectionWrites));
           }
           b.getMuxers().add(StreamMuxerProtocol.getMplex());