diff --git a/Incremental.c b/Incremental.c
index 0beab163..413c1750 100644
--- a/Incremental.c
+++ b/Incremental.c
@@ -1499,7 +1499,7 @@ static int Incremental_container(struct supertype *st, char *devname,
 		return 0;
 	}
 	for (ra = list ; ra ; ra = ra->next) {
-		int mdfd;
+		int mdfd = 0;
 		char chosen_name[1024];
 		struct map_ent *mp;
 		struct mddev_ident *match = NULL;
diff --git a/super-intel.c b/super-intel.c
index 520abf5d..7f347c73 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -9585,9 +9585,9 @@ static int apply_takeover_update(struct imsm_update_takeover *u,
 			du->major = 0;
 			du->index = (i * 2) + 1;
 			sprintf((char *)du->disk.serial,
-				" MISSING_%d", du->index);
+				" MISSING_%hu", du->index);
 			sprintf((char *)du->serial,
-				"MISSING_%d", du->index);
+				"MISSING_%hu", du->index);
 			du->next = super->missing;
 			super->missing = du;
 		}