diff --git a/src/comm.cpp b/src/comm.cpp
index 070fd8575a..a47807b410 100644
--- a/src/comm.cpp
+++ b/src/comm.cpp
@@ -87,7 +87,7 @@ Comm::Comm(LAMMPS *lmp) : Pointers(lmp)
   } else if (getenv("OMP_NUM_THREADS") == NULL) {
     nthreads = 1;
     if (me == 0)
-      error->warning(FLERR,"OMP_NUM_THREADS environment is not set. "
+      error->message(FLERR,"OMP_NUM_THREADS environment is not set. "
                            "Defaulting to 1 thread.");
   } else {
     nthreads = omp_get_max_threads();
diff --git a/src/comm_brick.cpp b/src/comm_brick.cpp
index 71bc74bb54..c44b41928f 100644
--- a/src/comm_brick.cpp
+++ b/src/comm_brick.cpp
@@ -39,9 +39,6 @@
 #include "error.h"
 #include "memory.h"
 
-// DEBUG
-#include "update.h"
-
 using namespace LAMMPS_NS;
 
 #define BUFFACTOR 1.5
diff --git a/src/comm_tiled.cpp b/src/comm_tiled.cpp
index 0167b23b18..c7e11f06a0 100644
--- a/src/comm_tiled.cpp
+++ b/src/comm_tiled.cpp
@@ -28,9 +28,6 @@
 #include "memory.h"
 #include "error.h"
 
-// DEBUG
-#include "update.h"
-
 using namespace LAMMPS_NS;
 
 #define BUFFACTOR 1.5
diff --git a/src/fix_ave_atom.cpp b/src/fix_ave_atom.cpp
index cf2842f441..3d8e40ac17 100644
--- a/src/fix_ave_atom.cpp
+++ b/src/fix_ave_atom.cpp
@@ -69,33 +69,33 @@ FixAveAtom::FixAveAtom(LAMMPS *lmp, int narg, char **arg) :
 
     if (strcmp(arg[i],"x") == 0) {
       which[i] = X;
-      argindex[i++] = 0;
+      argindex[i] = 0;
     } else if (strcmp(arg[i],"y") == 0) {
       which[i] = X;
-      argindex[i++] = 1;
+      argindex[i] = 1;
     } else if (strcmp(arg[i],"z") == 0) {
       which[i] = X;
-      argindex[i++] = 2;
+      argindex[i] = 2;
 
     } else if (strcmp(arg[i],"vx") == 0) {
       which[i] = V;
-      argindex[i++] = 0;
+      argindex[i] = 0;
     } else if (strcmp(arg[i],"vy") == 0) {
       which[i] = V;
-      argindex[i++] = 1;
+      argindex[i] = 1;
     } else if (strcmp(arg[i],"vz") == 0) {
       which[i] = V;
-      argindex[i++] = 2;
+      argindex[i] = 2;
 
     } else if (strcmp(arg[i],"fx") == 0) {
       which[i] = F;
-      argindex[i++] = 0;
+      argindex[i] = 0;
     } else if (strcmp(arg[i],"fy") == 0) {
       which[i] = F;
-      argindex[i++] = 1;
+      argindex[i] = 1;
     } else if (strcmp(arg[i],"fz") == 0) {
       which[i] = F;
-      argindex[i++] = 2;
+      argindex[i] = 2;
 
     } else if (strncmp(arg[i],"c_",2) == 0 ||
                strncmp(arg[i],"f_",2) == 0 ||