diff --git a/src/Makefile b/src/Makefile
index 3c4be1c991..fc61a8fe81 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,7 +13,7 @@ OBJ = 	$(SRC:.cpp=.o)
 
 # Package variables
 
-PACKAGE = asphere body class2 colloid dipole fld gpu granular kim \
+PACKAGE = asphere body class2 colloid coreshell dipole fld gpu granular kim \
 	  kokkos kspace manybody mc meam misc molecule mpiio opt peri poems \
 	  qeq reax replica rigid shock snap srd voronoi xtc
 
diff --git a/src/RIGID/fix_rigid_small.cpp b/src/RIGID/fix_rigid_small.cpp
index b0f3d56528..cced1764f7 100644
--- a/src/RIGID/fix_rigid_small.cpp
+++ b/src/RIGID/fix_rigid_small.cpp
@@ -2626,11 +2626,13 @@ void FixRigidSmall::set_molecule(int nlocalprev, tagint tagprev, int imol,
     displace[i][1] = onemols[imol]->dxbody[m][1];
     displace[i][2] = onemols[imol]->dxbody[m][2];
 
-    eflags[i] = 0;
-    if (onemols[imol]->radiusflag) {
-      eflags[i] |= SPHERE;
-      eflags[i] |= OMEGA;
-      eflags[i] |= TORQUE;
+    if (extended) {
+      eflags[i] = 0;
+      if (onemols[imol]->radiusflag) {
+        eflags[i] |= SPHERE;
+        eflags[i] |= OMEGA;
+        eflags[i] |= TORQUE;
+      }
     }
 
     if (bodyown[i] >= 0) {
diff --git a/src/velocity.cpp b/src/velocity.cpp
index 0723104e32..20d62b6b02 100644
--- a/src/velocity.cpp
+++ b/src/velocity.cpp
@@ -99,15 +99,15 @@ void Velocity::command(int narg, char **arg)
   else if (style == ZERO) options(narg-3,&arg[3]);
 
   // special cases where full init and border communication must be done first
-  // for CREATE/SET if compute temp/cs is used
   // for ZERO if fix rigid/small is used
+  // for CREATE/SET if compute temp/cs is used
   // b/c methods invoked in the compute/fix perform forward/reverse comm
 
   int initcomm = 0;
   if (style == ZERO && rfix >= 0 && 
       strcmp(modify->fix[rfix]->style,"rigid/small") == 0) initcomm = 1;
   if ((style == CREATE || style == SET) && temperature &&
-      strcmp(temperature->style,"temp/cs2") == 0) initcomm = 1;
+      strcmp(temperature->style,"temp/cs") == 0) initcomm = 1;
 
   if (initcomm) {
     lmp->init();