diff --git a/lib/format1/disk-rep.c b/lib/format1/disk-rep.c
index e68b3f5a5..896f4c7f0 100644
--- a/lib/format1/disk-rep.c
+++ b/lib/format1/disk-rep.c
@@ -194,7 +194,7 @@ int munge_pvd(struct device *dev, struct pv_disk *pvd)
 	if (!_munge_formats(pvd)) {
 		log_very_verbose("format1: Unknown metadata version %d "
 				 "found on %s", pvd->version, dev_name(dev));
-		return_0;
+		return 0;
 	}
 
 	/* If VG is exported, set VG name back to the real name */
@@ -208,7 +208,7 @@ static int _read_pvd(struct device *dev, struct pv_disk *pvd)
 	if (!dev_read(dev, UINT64_C(0), sizeof(*pvd), pvd)) {
 		log_very_verbose("Failed to read PV data from %s",
 				 dev_name(dev));
-		return_0;
+		return 0;
 	}
 
 	return munge_pvd(dev, pvd);
diff --git a/lib/label/label.c b/lib/label/label.c
index f2cb028a2..047e6a959 100644
--- a/lib/label/label.c
+++ b/lib/label/label.c
@@ -119,7 +119,7 @@ static struct labeller *_find_labeller(struct device *dev, char *buf,
 	if (!dev_read(dev, scan_sector << SECTOR_SHIFT,
 		      LABEL_SCAN_SIZE, readbuf)) {
 		log_debug("%s: Failed to read label area", dev_name(dev));
-		goto_out;
+		goto out;
 	}
 
 	/* Scan a few sectors for a valid label */