diff --git a/cmdline/elem.c b/cmdline/elem.c
index f5aa5fc1..cbd0b609 100644
--- a/cmdline/elem.c
+++ b/cmdline/elem.c
@@ -330,7 +330,7 @@ int filter_existence(int filter_missing, const char* dir, const char* sub)
 
 int filter_correctness(int filter_error, tommy_arrayblkof* infoarr, struct snapraid_disk* disk, struct snapraid_file* file)
 {
-	unsigned i;
+	block_off_t i;
 
 	if (!filter_error)
 		return 0;
diff --git a/cmdline/state.c b/cmdline/state.c
index 37fe0ddc..50d1fa90 100644
--- a/cmdline/state.c
+++ b/cmdline/state.c
@@ -2275,7 +2275,7 @@ static void state_read_content(struct snapraid_state* state, const char* path, S
 			uint64_t v_mtime_sec;
 			uint32_t v_mtime_nsec;
 			uint64_t v_inode;
-			uint32_t v_idx;
+			block_off_t v_idx;
 			struct snapraid_file* file;
 			struct snapraid_disk* disk;
 			uint32_t mapping;