diff --git a/lib/config/config.c b/lib/config/config.c
index 230ec3225..5986e64b1 100644
--- a/lib/config/config.c
+++ b/lib/config/config.c
@@ -1830,7 +1830,7 @@ static int _out_line_fn(const struct dm_config_node *cn, const char *line, void
 	char summary[MAX_COMMENT_LINE+1];
 	char version[9];
 	int pos = 0;
-	int space_prefix_len;
+	int space_prefix_len = 0;
 	const char *p;
 	size_t len;
 
diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index 9bf5f4821..670c52913 100644
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -252,7 +252,7 @@ static int _update_extents_params(struct volume_group *vg,
 	uint32_t size_rest;
 	uint32_t stripesize_extents;
 	uint32_t extents;
-	uint32_t base_calc_extents;
+	uint32_t base_calc_extents = 0;
 	uint32_t vdo_pool_max_extents;
 
 	if (lcp->size &&