diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c
index 64e168366..50bd1dfb6 100644
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
@@ -1830,8 +1830,8 @@ static void _daemonize(void)
 
 static void restart(void)
 {
-	struct dm_event_fifos fifos;
-	struct dm_event_daemon_message msg = { 0, 0, NULL };
+	struct dm_event_fifos fifos = { 0 };
+	struct dm_event_daemon_message msg = { 0 };
 	int i, count = 0;
 	char *message;
 	int length;
diff --git a/lib/config/config.c b/lib/config/config.c
index cda9b8377..7b6ac7b3f 100644
--- a/lib/config/config.c
+++ b/lib/config/config.c
@@ -879,16 +879,18 @@ int config_write(struct dm_config_tree *cft,
 		 int withcomment, int withversion,
 		 const char *file, int argc, char **argv)
 {
-	struct out_baton baton = {0, 0, 0};
+	static const struct dm_config_node_out_spec _out_spec = {
+		.prefix_fn = _out_prefix_fn,
+		.line_fn = _out_line_fn,
+		.suffix_fn = _out_suffix_fn
+	};
 	const struct dm_config_node *cn;
-	const struct dm_config_node_out_spec out_spec = {.prefix_fn = _out_prefix_fn,
-							 .line_fn = _out_line_fn,
-							 .suffix_fn = _out_suffix_fn};
+	struct out_baton baton = {
+		.withcomment = withcomment,
+		.withversion = withversion
+	};
 	int r = 1;
 
-	baton.withcomment = withcomment;
-	baton.withversion = withversion;
-
 	if (!file) {
 		baton.fp = stdout;
 		file = "stdout";
@@ -899,13 +901,13 @@ int config_write(struct dm_config_tree *cft,
 
 	log_verbose("Dumping configuration to %s", file);
 	if (!argc) {
-		if (!dm_config_write_node_out(cft->root, &out_spec, &baton)) {
+		if (!dm_config_write_node_out(cft->root, &_out_spec, &baton)) {
 			log_error("Failure while writing to %s", file);
 			r = 0;
 		}
 	} else while (argc--) {
 		if ((cn = dm_config_find_node(cft->root, *argv))) {
-			if (!dm_config_write_one_node_out(cn, &out_spec, &baton)) {
+			if (!dm_config_write_one_node_out(cn, &_out_spec, &baton)) {
 				log_error("Failure while writing to %s", file);
 				r = 0;
 			}
diff --git a/libdm/libdm-config.c b/libdm/libdm-config.c
index dfd917480..3385e18d2 100644
--- a/libdm/libdm-config.c
+++ b/libdm/libdm-config.c
@@ -346,12 +346,16 @@ static int _write_node(const struct dm_config_node *cn, int only_one,
 		       const struct dm_config_node_out_spec *out_spec,
 		       void *baton)
 {
-	struct config_output out;
-	if (!(out.mem = dm_pool_create("config_output", 1024)))
+	struct config_output out = {
+		.mem = dm_pool_create("config_output", 1024),
+		.putline = putline,
+		.spec = out_spec,
+		.baton = baton
+	};
+
+	if (!out.mem)
 		return_0;
-	out.putline = putline;
-	out.spec = out_spec;
-	out.baton = baton;
+
 	if (!_write_config(cn, only_one, &out, 0)) {
 		dm_pool_destroy(out.mem);
 		return_0;