diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index 0731108bd..b11d30697 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -6383,7 +6383,7 @@ int vg_strip_outdated_historical_lvs(struct volume_group *vg) {
 		 * Removal time in the future? Not likely,
 		 * but skip this item in any case.
 		*/
-		if ((current_time) < glvl->glv->historical->timestamp_removed)
+		if (current_time < (time_t) glvl->glv->historical->timestamp_removed)
 			continue;
 
 		if ((current_time - glvl->glv->historical->timestamp_removed) > threshold) {
diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c
index f9e261dd3..7caba985b 100644
--- a/libdm/libdm-report.c
+++ b/libdm/libdm-report.c
@@ -4209,7 +4209,7 @@ static void _recalculate_fields(struct dm_report *rh)
 {
 	struct row *row;
 	struct dm_report_field *field;
-	size_t len;
+	int len;
 
 	dm_list_iterate_items(row, &rh->rows) {
 		dm_list_iterate_items(field, &row->fields) {
diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
index b74a47099..587c74891 100644
--- a/libdm/libdm-stats.c
+++ b/libdm/libdm-stats.c
@@ -3294,7 +3294,7 @@ static void _sum_histogram_bins(const struct dm_stats *dms,
 	struct dm_stats_region *region;
 	struct dm_histogram_bin *bins;
 	struct dm_histogram *dmh_cur;
-	uint64_t bin;
+	int bin;
 
 	region = &dms->regions[region_id];
 	dmh_cur = region->counters[area_id].histogram;
@@ -4003,7 +4003,7 @@ merge:
 static void _stats_copy_histogram_bounds(struct dm_histogram *to,
 					 struct dm_histogram *from)
 {
-	uint64_t i;
+	int i;
 
 	to->nr_bins = from->nr_bins;
 
@@ -4019,7 +4019,7 @@ static void _stats_copy_histogram_bounds(struct dm_histogram *to,
 static int _stats_check_histogram_bounds(struct dm_histogram *h1,
 					 struct dm_histogram *h2)
 {
-	uint64_t i;
+	int i;
 
 	if (!h1 || !h2)
 		return 0;
diff --git a/tools/reporter.c b/tools/reporter.c
index e70fa2960..00606edc4 100644
--- a/tools/reporter.c
+++ b/tools/reporter.c
@@ -707,7 +707,7 @@ int report_for_selection(struct cmd_context *cmd,
 
 static void _check_pv_list(struct cmd_context *cmd, struct report_args *args, struct single_report_args *single_args)
 {
-	unsigned i;
+	int i;
 	int rescan_done = 0;
 
 	if (!args->argv)
diff --git a/tools/toollib.c b/tools/toollib.c
index 235e535ed..5f3deb7ed 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -4499,7 +4499,7 @@ int pvcreate_each_device(struct cmd_context *cmd,
 	int consistent = 0;
 	int must_use_all = (cmd->command->flags & MUST_USE_ALL_ARGS);
 	int found;
-	int i;
+	unsigned i;
 
 	set_pv_notify(cmd);
 
diff --git a/tools/vgextend.c b/tools/vgextend.c
index 344dff01d..e16316fd9 100644
--- a/tools/vgextend.c
+++ b/tools/vgextend.c
@@ -49,7 +49,7 @@ static int _vgextend_restoremissing(struct cmd_context *cmd __attribute__((unuse
 	struct vgextend_params *vp = (struct vgextend_params *) handle->custom_handle;
 	struct pvcreate_params *pp = &vp->pp;
 	int fixed = 0;
-	int i;
+	unsigned i;
 
 	if (!archive(vg))
 		return_0;