diff --git a/include/openPMD/auxiliary/Mpi.hpp b/include/openPMD/auxiliary/Mpi.hpp
index fe73e9bc9a..f8eefe0cc5 100644
--- a/include/openPMD/auxiliary/Mpi.hpp
+++ b/include/openPMD/auxiliary/Mpi.hpp
@@ -71,6 +71,7 @@ namespace
  * Multiple variable-length strings represented in one single buffer
  * with a fixed line width.
  * Strings smaller than the maximum width are padded with zeros.
+ * Each line is zero-terminated with at least one zero character.
  * The length of char_buffer should be equal to the product of line_length
  * and num_lines.
  */
diff --git a/src/ChunkInfo.cpp b/src/ChunkInfo.cpp
index e54edd0e85..606da23176 100644
--- a/src/ChunkInfo.cpp
+++ b/src/ChunkInfo.cpp
@@ -292,7 +292,7 @@ namespace chunk_assignment
         Assignment &sinkChunks = res.assigned;
         {
             ChunkTable leftover;
-            for (auto const &chunk : sourceChunks)
+            for (auto &chunk : sourceChunks)
             {
                 auto it = in.find(chunk.sourceID);
                 if (it == in.end())