diff --git a/src/media_stream.cc b/src/media_stream.cc
index f7a66477..bff4ea47 100644
--- a/src/media_stream.cc
+++ b/src/media_stream.cc
@@ -58,6 +58,10 @@ uvgrtp::media_stream::~media_stream()
 {
     pkt_dispatcher_->stop();
 
+    // TODO: I would take a close look at what happens when pull_frame is called
+    // and media stream is destroyed. Note that this is the only way to stop pull
+    // frame without waiting
+
     if (ctx_config_.flags & RCE_RTCP)
         rtcp_->stop();
 
diff --git a/src/socket.cc b/src/socket.cc
index c5e720b8..7071822d 100644
--- a/src/socket.cc
+++ b/src/socket.cc
@@ -86,7 +86,7 @@ rtp_error_t uvgrtp::socket::bind(short family, unsigned host, short port)
 #else
         fprintf(stderr, "%s\n", strerror(errno));
 #endif
-        LOG_ERROR("Biding to port %u failed!", port);
+        LOG_ERROR("Binding to port %u failed!", port);
         return RTP_BIND_ERROR;
     }