diff --git a/src/DB.zig b/src/DB.zig
index 0e7f9e2..f41cd0e 100644
--- a/src/DB.zig
+++ b/src/DB.zig
@@ -580,8 +580,7 @@ fn usersSection(
     // 8 bytes. 24 is an optimistic lower bound for an average record size.
     var blob = try ArrayListAligned(u8, 8).initCapacity(allocator, 24 * corpus.users.len);
     errdefer blob.deinit();
-    var i: usize = 0;
-    while (i < corpus.users.len) : (i += 1) {
+    for (0..corpus.users.len) |i| {
         // TODO: this may be inefficient by calling `.slice()` on every iteration?
         const user = corpus.users.get(i);
         const user_offset = math.cast(u35, blob.items.len) orelse return error.TooMany;
@@ -873,8 +872,7 @@ test "DB additionalGids" {
     defer allocator.free(additional_gids.idx2offset);
     defer allocator.free(additional_gids.blob);
 
-    var user_idx: usize = 0;
-    while (user_idx < corpus.users.len) : (user_idx += 1) {
+    for (0..corpus.users.len) |user_idx| {
         const groups = corpus.user2groups[user_idx];
         const offset = additional_gids.idx2offset[user_idx];
         if (groups.len == 0) {
diff --git a/src/turbonss-makecorpus.zig b/src/turbonss-makecorpus.zig
index b583584..38e98a2 100644
--- a/src/turbonss-makecorpus.zig
+++ b/src/turbonss-makecorpus.zig
@@ -131,7 +131,7 @@ fn dump_passwd(wr: anytype, num_users: u64) error{IO}!void {
         const gecos = fmt.bufPrint(buf_gecos[0..], "User {d}", .{i}) catch unreachable;
         const home = fmt.bufPrint(buf_home[0..], "/home/{s}", .{name}) catch unreachable;
         const user = User{
-            .uid = i,
+            .uid = @intCast(u32, i),
             .gid = 1000000,
             .name = name,
             .gecos = gecos,