diff --git a/lib/command_graph.h b/lib/command_graph.h
index cfacad43e2..903d515834 100644
--- a/lib/command_graph.h
+++ b/lib/command_graph.h
@@ -118,7 +118,7 @@ extern void cmd_token_varname_set(struct cmd_token *token, const char *varname);
 
 extern void cmd_graph_parse(struct graph *graph, struct cmd_element *cmd);
 extern void cmd_graph_names(struct graph *graph);
-extern void cmd_graph_merge(struct graph *old, struct graph *new,
+extern void cmd_graph_merge(struct graph *old, struct graph *n,
 			    int direction);
 /*
  * Print callback for DOT dumping.
diff --git a/lib/module.h b/lib/module.h
index 73ba8665ed..c5f96db85b 100644
--- a/lib/module.h
+++ b/lib/module.h
@@ -82,9 +82,10 @@ extern union _frrmod_runtime_u _frrmod_this_module;
 
 #define FRR_COREMOD_SETUP(...)                                                 \
 	static const struct frrmod_info _frrmod_info = {__VA_ARGS__};          \
-	DSO_LOCAL union _frrmod_runtime_u _frrmod_this_module = {              \
-		.r.info = &_frrmod_info,                                       \
-	};
+	DSO_LOCAL union _frrmod_runtime_u _frrmod_this_module = {{             \
+		NULL,                                                          \
+		&_frrmod_info,                                                 \
+	}};
 #define FRR_MODULE_SETUP(...)                                                  \
 	FRR_COREMOD_SETUP(__VA_ARGS__)                                         \
 	DSO_SELF struct frrmod_runtime *frr_module = &_frrmod_this_module.r;
diff --git a/lib/pw.h b/lib/pw.h
index 0b923ed6b1..42b3ee2155 100644
--- a/lib/pw.h
+++ b/lib/pw.h
@@ -48,9 +48,6 @@ union pw_protocol_fields {
 		uint32_t pwid;
 		char vpn_name[L2VPN_NAME_LEN];
 	} ldp;
-	struct {
-		/* TODO */
-	} bgp;
 };
 
 #ifdef __cplusplus