diff --git a/src/fix_property_atom.cpp b/src/fix_property_atom.cpp
index 80583ae41d..fa7a51fab0 100644
--- a/src/fix_property_atom.cpp
+++ b/src/fix_property_atom.cpp
@@ -172,7 +172,7 @@ void FixPropertyAtom::read_data_section(char *keyword, int n, char *buf)
 
   char **values = new char*[nwords];
 
-  // loop over lines of atom velocities
+  // loop over lines of atom info
   // tokenize the line into values
   // if I own atom tag, unpack its values
 
@@ -272,7 +272,7 @@ void FixPropertyAtom::write_data_section_pack(int mth, double **buf)
 
 void FixPropertyAtom::write_data_section_keyword(int mth, FILE *fp)
 {
-  if (nvalue == 1 && style[0] == MOLECULE) fprintf(fp,"\nMolecule\n\n");
+  if (nvalue == 1 && style[0] == MOLECULE) fprintf(fp,"\nMolecules\n\n");
   else fprintf(fp,"\n%s\n\n",id);
 }
 
diff --git a/src/velocity.cpp b/src/velocity.cpp
index 701a4f31eb..501a128c6b 100644
--- a/src/velocity.cpp
+++ b/src/velocity.cpp
@@ -632,27 +632,25 @@ void Velocity::zero(int narg, char **arg)
   if (strcmp(arg[0],"linear") == 0) {
     if (rfix < 0) zero_momentum();
     else {
-      if (strcmp(modify->fix[rfix]->style,"rigid") == 0)
-        ((FixRigid *) modify->fix[rfix])->zero_momentum(igroup);
-      else if (strcmp(modify->fix[rfix]->style,"rigid/small") == 0) {
+      if (strcmp(modify->fix[rfix]->style,"rigid/small") == 0) {
         lmp->init();
         ((FixRigidSmall *) modify->fix[rfix])->setup_pre_neighbor();
         ((FixRigidSmall *) modify->fix[rfix])->zero_momentum(igroup);
-      }
-      else error->all(FLERR,"Velocity rigid used with non-rigid fix-ID");
+      } else if (strstr(modify->fix[rfix]->style,"rigid")) {
+        ((FixRigid *) modify->fix[rfix])->zero_momentum(igroup);
+      } else error->all(FLERR,"Velocity rigid used with non-rigid fix-ID");
     }
 
   } else if (strcmp(arg[0],"angular") == 0) {
     if (rfix < 0) zero_rotation();
     else {
-      if (strcmp(modify->fix[rfix]->style,"rigid") == 0)
-        ((FixRigid *) modify->fix[rfix])->zero_rotation(igroup);
-      else if (strcmp(modify->fix[rfix]->style,"rigid/small") == 0) {
+      if (strcmp(modify->fix[rfix]->style,"rigid/small") == 0) {
         lmp->init();
         ((FixRigidSmall *) modify->fix[rfix])->setup_pre_neighbor();
         ((FixRigidSmall *) modify->fix[rfix])->zero_rotation(igroup);
-      }
-      else error->all(FLERR,"Velocity rigid used with non-rigid fix-ID");
+      } else if (strstr(modify->fix[rfix]->style,"rigid")) {
+        ((FixRigid *) modify->fix[rfix])->zero_rotation(igroup);
+      } else error->all(FLERR,"Velocity rigid used with non-rigid fix-ID");
     }
 
   } else error->all(FLERR,"Illegal velocity command");