diff --git a/client.go b/client.go
index 5f149d96..837c9112 100644
--- a/client.go
+++ b/client.go
@@ -1886,7 +1886,7 @@ func (c *Client) PacketPTS(medi *description.Media, pkt *rtp.Packet) (time.Durat
 }
 
 // PacketNTP returns the NTP timestamp of an incoming RTP packet.
-// The NTP timestamp is computed from sender reports.
+// The NTP timestamp is computed from RTCP sender reports.
 func (c *Client) PacketNTP(medi *description.Media, pkt *rtp.Packet) (time.Time, bool) {
 	cm := c.medias[medi]
 	ct := cm.formats[pkt.PayloadType]
diff --git a/client_udp_listener.go b/client_udp_listener.go
index 7fac5124..61161fb2 100644
--- a/client_udp_listener.go
+++ b/client_udp_listener.go
@@ -136,6 +136,7 @@ func (u *clientUDPListener) start() {
 func (u *clientUDPListener) stop() {
 	u.pc.SetReadDeadline(time.Now())
 	<-u.done
+	u.running = false
 }
 
 func (u *clientUDPListener) run() {
diff --git a/server_session.go b/server_session.go
index c6634a1a..cdc423fc 100644
--- a/server_session.go
+++ b/server_session.go
@@ -1250,7 +1250,7 @@ func (ss *ServerSession) PacketPTS(medi *description.Media, pkt *rtp.Packet) (ti
 }
 
 // PacketNTP returns the NTP timestamp of an incoming RTP packet.
-// The NTP timestamp is computed from sender reports.
+// The NTP timestamp is computed from RTCP sender reports.
 func (ss *ServerSession) PacketNTP(medi *description.Media, pkt *rtp.Packet) (time.Time, bool) {
 	sm := ss.setuppedMedias[medi]
 	sf := sm.formats[pkt.PayloadType]