diff --git a/src/common_io.c b/src/common_io.c
index 4e07406cc748dfa3d1472361246564f625aa8e01..494a702125cf873946d06855b5683216cb2aceaf 100644
--- a/src/common_io.c
+++ b/src/common_io.c
@@ -828,8 +828,8 @@ void io_check_output_fields(const struct swift_params* params,
   struct gpart gp;
 
   /* Copy N_total to array with length == 6 */
-  const long long nr_total[swift_type_count] = {
-      N_total[0], N_total[1], 0, 0, N_total[2], 0};
+  const long long nr_total[swift_type_count] = {N_total[0], N_total[1], 0,
+                                                0,          N_total[2], 0};
 
   /* Loop over all particle types to check the fields */
   for (int ptype = 0; ptype < swift_type_count; ptype++) {
diff --git a/src/engine.c b/src/engine.c
index 6b56faf0fa86d935462e0251340761a39d5d5328..14c91997575c218d765eb27f10837255c7917aa0 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -4113,13 +4113,13 @@ void engine_collect_end_of_step(struct engine *e, int apply) {
                       MPI_COMM_WORLD) != MPI_SUCCESS)
       error("Failed to aggregate particle counts.");
     if (in_ll[0] != (long long)e->collect_group1.updates)
-      error("Failed to get same updates, is %lld, should be %ld", in_ll[0],
+      error("Failed to get same updates, is %lld, should be %lld", in_ll[0],
             e->collect_group1.updates);
     if (in_ll[1] != (long long)e->collect_group1.g_updates)
-      error("Failed to get same g_updates, is %lld, should be %ld", in_ll[1],
+      error("Failed to get same g_updates, is %lld, should be %lld", in_ll[1],
             e->collect_group1.g_updates);
     if (in_ll[2] != (long long)e->collect_group1.s_updates)
-      error("Failed to get same s_updates, is %lld, should be %ld", in_ll[2],
+      error("Failed to get same s_updates, is %lld, should be %lld", in_ll[2],
             e->collect_group1.s_updates);
 
     int buff = 0;