diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index 81f84b3..fce416c 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -2598,7 +2598,7 @@ WHERE builder != 'builtin:download'
                           descriptions-by-locale))))
                      inferior-lint-checkers-data))))
                 (lint-warnings-data
-                 (fibers-map
+                 (fibers-batch-map
                   (match-lambda
                     ((checker-name _ network-dependent?)
                      (and (and (not network-dependent?)
@@ -2613,6 +2613,7 @@ WHERE builder != 'builtin:download'
                                                        inferior-store
                                                        checker-name))
                              #:memory-limit inferior-memory-limit)))))
+                  20                    ; TODO
                   inferior-lint-checkers-data)))
 
         (let ((package-ids (fibers-force package-ids-promise)))
@@ -2888,7 +2889,7 @@ WHERE builder != 'builtin:download'
                            (cons system drv)))))
                      channel-derivations-by-system))
                    (derivation-ids-by-system
-                    (fibers-map
+                    (fibers-batch-map
                      (match-lambda
                        ((system . drv)
                         (cons system
@@ -2900,6 +2901,7 @@ WHERE builder != 'builtin:download'
                                 (make-hash-table)
                                 (vector drv))
                                0))))
+                     20                 ; TODO
                      derivations-by-system)))
 
               (insert-channel-instances channel-instances-conn