diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index f110005e49..fcb7275c34 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -1335,7 +1335,7 @@ void bgp_fsm_change_status(struct peer *peer, int status)
 	bgp_peer_update_orr_active_roots(peer);
 
 	if (bgp_debug_neighbor_events(peer))
-		zlog_debug("%s went from %s to %s", peer->host,
+		zlog_debug("%s fd %d went from %s to %s", peer->host, peer->fd,
 			   lookup_msg(bgp_status_msg, peer->ostatus, NULL),
 			   lookup_msg(bgp_status_msg, peer->status, NULL));
 }
diff --git a/bgpd/bgp_keepalives.c b/bgpd/bgp_keepalives.c
index 604d6c9509..b39a7daa1d 100644
--- a/bgpd/bgp_keepalives.c
+++ b/bgpd/bgp_keepalives.c
@@ -115,7 +115,7 @@ static void peer_process(struct hash_bucket *hb, void *arg)
 		elapsed.tv_sec >= ka.tv_sec || timercmp(&diff, &tolerance, <);
 
 	if (send_keepalive) {
-		if (bgp_debug_neighbor_events(pkat->peer))
+		if (bgp_debug_keepalive(pkat->peer))
 			zlog_debug("%s [FSM] Timer (keepalive timer expire)",
 				   pkat->peer->host);
 
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index 9582ec01ed..b43f8c8664 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -530,8 +530,10 @@ static void bgp_accept(struct thread *thread)
 	}
 
 	if (bgp_debug_neighbor_events(peer1))
-		zlog_debug("[Event] BGP connection from host %s fd %d",
-			   inet_sutop(&su, buf), bgp_sock);
+		zlog_debug(
+			"[Event] connection from %s fd %d, active peer status %d fd %d",
+			inet_sutop(&su, buf), bgp_sock, peer1->status,
+			peer1->fd);
 
 	if (peer1->doppelganger) {
 		/* We have an existing connection. Kill the existing one and run
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 6eb1a556b1..2ca9502545 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -2653,12 +2653,7 @@ static void bgp_route_select_timer_expire(struct thread *thread)
 	safi = info->safi;
 	bgp = info->bgp;
 
-	if (BGP_DEBUG(update, UPDATE_OUT))
-		zlog_debug("afi %d, safi %d : route select timer expired", afi,
-			   safi);
-
 	bgp->gr_info[afi][safi].t_route_select = NULL;
-
 	XFREE(MTYPE_TMP, info);
 
 	/* Best path selection */