diff --git a/webrtc/modules/rtp_rtcp/include/flexfec_sender.h b/webrtc/modules/rtp_rtcp/include/flexfec_sender.h
index fa4bd6e7ec..e69daf3ff0 100644
--- a/webrtc/modules/rtp_rtcp/include/flexfec_sender.h
+++ b/webrtc/modules/rtp_rtcp/include/flexfec_sender.h
@@ -30,7 +30,7 @@ namespace webrtc {
 class RtpPacketToSend;
 
 // Note that this class is not thread safe, and thus requires external
-// synchronization.
+// synchronization. Currently, this is done using the lock in PayloadRouter.
 
 class FlexfecSender {
  public:
diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
index 38a2e5df39..25bb4683cc 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -194,7 +194,7 @@ std::string VideoSendStream::Config::Rtp::ToString() const {
     if (i != flexfec.protected_media_ssrcs.size() - 1)
       ss << ", ";
   }
-  ss << ']';
+  ss << "]}";
 
   ss << ", rtx: " << rtx.ToString();
   ss << ", c_name: " << c_name;
@@ -416,7 +416,7 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver,
   BitrateAllocator* const bitrate_allocator_;
   VieRemb* const remb_;
 
-  // TODO(brandtr): Consider moving this to a new FlexfecSendStream class.
+  // TODO(brandtr): Move ownership to PayloadRouter.
   std::unique_ptr<FlexfecSender> flexfec_sender_;
 
   rtc::CriticalSection ivf_writers_crit_;