diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 98ebf51385..42ba54ab7b 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -2933,7 +2933,7 @@ static inline bool gr_mode_matches(enum peer_mode peer_gr_mode,
 unsigned int bgp_peer_gr_action(struct peer *peer, enum peer_mode old_state,
 				enum peer_mode new_state)
 {
-	enum global_mode global_gr_mode = bgp_global_gr_mode_get(peer->bgp);
+	enum global_mode global_gr_mode;
 	bool session_reset = true;
 
 	if (old_state == new_state)
diff --git a/lib/yang.c b/lib/yang.c
index 6a8e5223a0..6c1aed00cc 100644
--- a/lib/yang.c
+++ b/lib/yang.c
@@ -1398,8 +1398,10 @@ LY_ERR yang_lyd_trim_xpath(struct lyd_node **root, const char *xpath)
 		}
 	}
 	darr_foreach_i (remove, i) {
-		if (remove[i] == *root)
+		if (remove[i] == *root) {
+			assert(*root);
 			*root = (*root)->next;
+		}
 		lyd_free_tree(remove[i]);
 	}
 	darr_free(remove);