diff --git a/src/balance.cpp b/src/balance.cpp
index 89f0ccb5cc..71b8eeabc5 100644
--- a/src/balance.cpp
+++ b/src/balance.cpp
@@ -279,14 +279,14 @@ void Balance::command(int narg, char **arg)
   if (style == XYZ) {
     if (comm->layout == LAYOUT_UNIFORM) {
       if (xflag == USER || yflag == USER || zflag == USER)
-        comm->layout == LAYOUT_NONUNIFORM;
+        comm->layout = LAYOUT_NONUNIFORM;
     } else if (comm->style == LAYOUT_NONUNIFORM) {
       if (xflag == UNIFORM && yflag == UNIFORM && zflag == UNIFORM)
-        comm->layout == LAYOUT_UNIFORM;
+        comm->layout = LAYOUT_UNIFORM;
     } else if (comm->style == LAYOUT_TILED) {
       if (xflag == UNIFORM && yflag == UNIFORM && zflag == UNIFORM)
-        comm->layout == LAYOUT_UNIFORM;
-      else comm->layout == LAYOUT_NONUNIFORM;
+        comm->layout = LAYOUT_UNIFORM;
+      else comm->layout = LAYOUT_NONUNIFORM;
     }
 
     if (xflag == UNIFORM) {
diff --git a/src/fix_adapt.cpp b/src/fix_adapt.cpp
index 22e718dd76..246d828e7d 100644
--- a/src/fix_adapt.cpp
+++ b/src/fix_adapt.cpp
@@ -498,8 +498,6 @@ void FixAdapt::restore_settings()
 
     } else if (ad->which == ATOM) {
       if (diamflag) {
-        int mflag = 0;
-        if (atom->rmass_flag) mflag = 1;
         double density;
 
         double *vec = fix_diam->vstore;