diff --git a/src/read_data.cpp b/src/read_data.cpp
index 3b7127dccf..e7b14b84d8 100644
--- a/src/read_data.cpp
+++ b/src/read_data.cpp
@@ -459,9 +459,8 @@ void ReadData::atoms()
 	if (eof == NULL) error->one("Unexpected end of data file");
 	m += strlen(&buffer[m]);
       }
-      buffer[m++] = '\n';
+      m++;
     }
-    buffer[m] = '\0';
     MPI_Bcast(&m,1,MPI_INT,0,world);
     MPI_Bcast(buffer,m,MPI_CHAR,0,world);
 
@@ -551,9 +550,8 @@ void ReadData::velocities()
 	if (eof == NULL) error->one("Unexpected end of data file");
 	m += strlen(&buffer[m]);
       }
-      buffer[m++] = '\n';
+      m++;
     }
-    buffer[m] = '\0';
     MPI_Bcast(&m,1,MPI_INT,0,world);
     MPI_Bcast(buffer,m,MPI_CHAR,0,world);
 
@@ -603,9 +601,8 @@ void ReadData::ellipsoids()
 	if (eof == NULL) error->one("Unexpected end of data file");
 	m += strlen(&buffer[m]);
       }
-      buffer[m++] = '\n';
+      m++;
     }
-    buffer[m] = '\0';
     MPI_Bcast(&m,1,MPI_INT,0,world);
     MPI_Bcast(buffer,m,MPI_CHAR,0,world);
 
@@ -643,9 +640,8 @@ void ReadData::bonds()
 	if (eof == NULL) error->one("Unexpected end of data file");
 	m += strlen(&buffer[m]);
       }
-      buffer[m++] = '\n';
+      m++;
     }
-    buffer[m] = '\0';
     MPI_Bcast(&m,1,MPI_INT,0,world);
     MPI_Bcast(buffer,m,MPI_CHAR,0,world);
 
@@ -689,9 +685,8 @@ void ReadData::angles()
 	if (eof == NULL) error->one("Unexpected end of data file");
 	m += strlen(&buffer[m]);
       }
-      buffer[m++] = '\n';
+      m++;
     }
-    buffer[m] = '\0';
     MPI_Bcast(&m,1,MPI_INT,0,world);
     MPI_Bcast(buffer,m,MPI_CHAR,0,world);
 
@@ -735,9 +730,8 @@ void ReadData::dihedrals()
 	if (eof == NULL) error->one("Unexpected end of data file");
 	m += strlen(&buffer[m]);
       }
-      buffer[m++] = '\n';
+      m++;
     }
-    buffer[m] = '\0';
     MPI_Bcast(&m,1,MPI_INT,0,world);
     MPI_Bcast(buffer,m,MPI_CHAR,0,world);
 
@@ -782,9 +776,8 @@ void ReadData::impropers()
 	if (eof == NULL) error->one("Unexpected end of data file");
 	m += strlen(&buffer[m]);
       }
-      buffer[m++] = '\n';
+      m++;
     }
-    buffer[m] = '\0';
     MPI_Bcast(&m,1,MPI_INT,0,world);
     MPI_Bcast(buffer,m,MPI_CHAR,0,world);
 
diff --git a/src/thermo.cpp b/src/thermo.cpp
index 700ada3b85..1653de8f42 100644
--- a/src/thermo.cpp
+++ b/src/thermo.cpp
@@ -370,6 +370,7 @@ bigint Thermo::lost_check()
   if (ntotal == atom->natoms) return ntotal;
 
   // if not checking or already warned, just return
+  // reset total atom count
 
   if (lostflag == IGNORE) return ntotal;
   if (lostflag == WARN && lostbefore == 1) {
@@ -395,6 +396,8 @@ bigint Thermo::lost_check()
 	  atom->natoms,ntotal);
   if (me == 0) error->warning(str,0);
 
+  // reset total atom count
+
   atom->natoms = ntotal;
   lostbefore = 1;
   return ntotal;