diff --git a/lib/MacroMagic.h b/lib/MacroMagic.h
index 00f60089..f0762337 100644
--- a/lib/MacroMagic.h
+++ b/lib/MacroMagic.h
@@ -60,6 +60,7 @@
 				     )(                                 \
 				       /* Do nothing, just terminate */ \
 									)
+
 #define _GRID_MACRO_MAP() GRID_MACRO_MAP
 
 #define GRID_MACRO_MEMBER(A,B)        A B;
@@ -67,7 +68,11 @@
 #define GRID_MACRO_OS_WRITE_MEMBER(A,B) os<< #A <<" "#B <<" = "<< obj. B <<" ; " <<std::endl;
 
 #define GRID_DECL_CLASS_MEMBERS(cname,...)		\
+  \
+  \
   GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_MEMBER,__VA_ARGS__))		\
+  \
+  \
   friend std::ostream & operator << (std::ostream &os, const cname &obj ) {	\
     os<<"class "<<#cname<<" {"<<std::endl;\
     GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_OS_WRITE_MEMBER,__VA_ARGS__))	\
diff --git a/lib/lattice/Lattice_rng.h b/lib/lattice/Lattice_rng.h
index 23ecb534..895d49ad 100644
--- a/lib/lattice/Lattice_rng.h
+++ b/lib/lattice/Lattice_rng.h
@@ -263,11 +263,11 @@ namespace Grid {
       int     osites=_grid->oSites();
       int words=sizeof(scalar_object)/sizeof(scalar_type);
 
-      std::vector<scalar_object> buf(Nsimd);
 
 PARALLEL_FOR_LOOP
       for(int ss=0;ss<osites;ss++){
 
+	std::vector<scalar_object> buf(Nsimd);
 	for(int m=0;m<multiplicity;m++) {// Draw from same generator multiplicity times
 
 	  int sm=multiplicity*ss+m;      // Maps the generator site to the fine site