diff --git a/Grid/stencil/Stencil.h b/Grid/stencil/Stencil.h
index 181f10434..8c1a3f2e6 100644
--- a/Grid/stencil/Stencil.h
+++ b/Grid/stencil/Stencil.h
@@ -563,7 +563,7 @@ public:
       _grid->StencilBarrier(); 
 #endif
     }
-    traceID = traceStart("Stencil::CommunicateBegin");
+    traceID = traceStart("Stencil Communicate");
     OffNodeBytes=0;
     CommTimer=-usecond();
     for(int i=0;i<Packets.size();i++){
diff --git a/Grid/util/Init.cc b/Grid/util/Init.cc
index 088fedf6b..c74b91788 100644
--- a/Grid/util/Init.cc
+++ b/Grid/util/Init.cc
@@ -653,20 +653,20 @@ void Grid_init(int *argc,char ***argv)
 
 void Grid_finalize(void)
 {
-  std::cout<<GridLogMessage<<"*******************************************"<<std::endl;
-  std::cout<<GridLogMessage<<"******* Grid Finalize entered         ******"<<std::endl;
+  std::cout<<GridLogMessage<<"********************************************"<<std::endl;
+  std::cout<<GridLogMessage<<"******* Grid Finalize                 ******"<<std::endl;
   CartesianCommunicator::BarrierWorld();
   std::cout<<GridLogMessage<<"******* Grid Finalize synched         ******"<<std::endl;
 				    
 #if defined (GRID_COMMS_MPI) || defined (GRID_COMMS_MPI3) || defined (GRID_COMMS_MPIT)
   MPI_Finalize();
-  Grid_unquiesce_nodes();
 #endif
 #if defined (GRID_COMMS_SHMEM)
   shmem_finalize();
 #endif
   std::cout<<GridLogMessage<<"******* Grid Finalize successful     ******"<<std::endl;
   std::cout<<GridLogMessage<<"*******************************************"<<std::endl;
+  Grid_unquiesce_nodes();
   Grid_is_initialised = 0;
 }