diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 00622c428..308413458 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -713,7 +713,7 @@ static struct fsck_instance *wait_one(int flags)
 				warnx(_("wait: no more child process?!?"));
 				return NULL;
 			}
-			warn(_("waidpid failed"));
+			warn(_("waitpid failed"));
 			continue;
 		}
 		for (prev = 0, inst = instance_list;
diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index 163a87b46..3aa40deea 100644
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -808,8 +808,8 @@ static int add_partition(struct fdisk_context *cxt, int n, struct fdisk_parttype
 	sys = t ? t->type : MBR_LINUX_DATA_PARTITION;
 
 	if (p && p->sys_ind) {
-		fdisk_warnx(cxt, _("Partition %d is already defined.  Delete "
-			 "it before re-adding it."), n + 1);
+		fdisk_warnx(cxt, _("Partition %zd is already defined.  "
+			           "Delete it before re-adding it."), n + 1);
 		return -EINVAL;
 	}
 	fill_bounds(cxt, first, last);
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index 9536eb383..0692d158e 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -1658,8 +1658,8 @@ static int gpt_add_partition(
 	ents = gpt->ents;
 
 	if (!partition_unused(&ents[partnum])) {
-		fdisk_warnx(cxt, _("Partition %zd is already defined. "
-			 "Delete it before re-adding it."), partnum +1);
+		fdisk_warnx(cxt, _("Partition %zd is already defined.  "
+			           "Delete it before re-adding it."), partnum +1);
 		return -EINVAL;
 	}
 	if (le32_to_cpu(pheader->npartition_entries) ==
diff --git a/libfdisk/src/sgi.c b/libfdisk/src/sgi.c
index 96e84f21c..ce2367595 100644
--- a/libfdisk/src/sgi.c
+++ b/libfdisk/src/sgi.c
@@ -977,7 +977,7 @@ static int sgi_create_disklabel(struct fdisk_context *cxt)
 		} else {
 			/* otherwise print error and use truncated version */
 			fdisk_warnx(cxt,
-				_("Warning:  BLKGETSIZE ioctl failed on %s. "
+				_("BLKGETSIZE ioctl failed on %s. "
 				  "Using geometry cylinder value of %llu. "
 				  "This value may be truncated for devices "
 				  "> 33.8 GB."), cxt->dev_path, cxt->geom.cylinders);