diff --git a/extras/Hadrons/Global.cc b/extras/Hadrons/Global.cc
index 54507bdf..4a39af45 100644
--- a/extras/Hadrons/Global.cc
+++ b/extras/Hadrons/Global.cc
@@ -40,7 +40,7 @@ HadronsLogger Hadrons::HadronsLogIterative(1,"Iterative");
 HadronsLogger Hadrons::HadronsLogDebug(1,"Debug");
 
 // type utilities //////////////////////////////////////////////////////////////
-constexpr unsigned int maxNameSize = 1024u;
+//constexpr unsigned int maxNameSize = 1024u;
 
 std::string Hadrons::typeName(const std::type_info *info)
 {
diff --git a/extras/Hadrons/Modules/MContraction/WardIdentity.hpp b/extras/Hadrons/Modules/MContraction/WardIdentity.hpp
index 556450a8..9f04a0e9 100644
--- a/extras/Hadrons/Modules/MContraction/WardIdentity.hpp
+++ b/extras/Hadrons/Modules/MContraction/WardIdentity.hpp
@@ -145,7 +145,7 @@ void TWardIdentity<FImpl>::execute(void)
     // Compute D_mu V_mu, D here is backward derivative.
     envGetTmp(PropagatorField, tmp);
     envGetTmp(PropagatorField, vector_WI);
-    vector_WI    = zero;
+    vector_WI    = Zero();
     for (unsigned int mu = 0; mu < Nd; ++mu)
     {
         act.ContractConservedCurrent(q, q, tmp, Current::Vector, mu);
@@ -166,7 +166,7 @@ void TWardIdentity<FImpl>::execute(void)
         std::vector<TComplex> axial_buf;
 
         // Compute <P|D_mu A_mu>, D is backwards derivative.
-        axial_defect = zero;
+        axial_defect = Zero();
         for (unsigned int mu = 0; mu < Nd; ++mu)
         {
             act.ContractConservedCurrent(q, q, tmp, Current::Axial, mu);
@@ -174,8 +174,8 @@ void TWardIdentity<FImpl>::execute(void)
             axial_defect += trace(g5*tmp);
         }
 
-        // Get <P|J5q> for 5D (zero for 4D) and <P|P>.
-        PJ5q = zero;
+        // Get <P|J5q> for 5D (Zero() for 4D) and <P|P>.
+        PJ5q = Zero();
         if (Ls_ > 1)
         {
             // <P|P>
diff --git a/extras/Hadrons/Modules/MContraction/WeakHamiltonian.hpp b/extras/Hadrons/Modules/MContraction/WeakHamiltonian.hpp
index 7df40370..15f1a009 100644
--- a/extras/Hadrons/Modules/MContraction/WeakHamiltonian.hpp
+++ b/extras/Hadrons/Modules/MContraction/WeakHamiltonian.hpp
@@ -55,7 +55,7 @@ for (unsigned int t = 0; t < buf.size(); ++t)\
 
 //// Contraction of mu index: use 'mu' variable in exp.
 #define SUM_MU(buf,exp)\
-buf = zero;\
+   buf = Zero();				\
 for (unsigned int mu = 0; mu < ndim; ++mu)\
 {\
     buf += exp;\
diff --git a/extras/Hadrons/Modules/MFermion/GaugeProp.hpp b/extras/Hadrons/Modules/MFermion/GaugeProp.hpp
index 05b3d17a..3316a82f 100644
--- a/extras/Hadrons/Modules/MFermion/GaugeProp.hpp
+++ b/extras/Hadrons/Modules/MFermion/GaugeProp.hpp
@@ -52,7 +52,7 @@ inline void make_4D(Lattice<vobj> &in_5d, Lattice<vobj> &out_4d, int Ls)
 template<class vobj>
 inline void make_5D(Lattice<vobj> &in_4d, Lattice<vobj> &out_5d, int Ls)
 {
-    out_5d = zero;
+    out_5d = Zero();
     InsertSlice(in_4d, out_5d, 0, 0);
     InsertSlice(in_4d, out_5d, Ls-1, 0);
     axpby_ssp_pplus(out_5d, 0., out_5d, 1., out_5d, 0, 0);
@@ -185,7 +185,7 @@ void TGaugeProp<FImpl>::execute(void)
                 PropToFerm(source, fullSrc, s, c);
             }
         }
-        sol = zero;
+        sol = Zero();
         solver(sol, source);
         FermToProp(prop, sol, s, c);
         // create 4D propagators from 5D one if necessary
diff --git a/extras/Hadrons/Modules/MScalar/ChargedProp.cc b/extras/Hadrons/Modules/MScalar/ChargedProp.cc
index 6cb75a28..95a81de6 100644
--- a/extras/Hadrons/Modules/MScalar/ChargedProp.cc
+++ b/extras/Hadrons/Modules/MScalar/ChargedProp.cc
@@ -168,7 +168,7 @@ void TChargedProp::momD1(ScalarField &s, FFT &fft)
     envGetTmp(ScalarField, result);
     envGetTmp(ScalarField, Amu);
 
-    result = zero;
+    result = Zero();
     for (unsigned int mu = 0; mu < env().getNd(); ++mu)
     {
         Amu = peekLorentz(A, mu);
@@ -198,7 +198,7 @@ void TChargedProp::momD2(ScalarField &s, FFT &fft)
     envGetTmp(ScalarField, result);
     envGetTmp(ScalarField, Amu);
 
-    result = zero;
+    result = Zero();
     for (unsigned int mu = 0; mu < env().getNd(); ++mu)
     {
         Amu = peekLorentz(A, mu);
diff --git a/extras/Hadrons/Modules/MSink/Point.hpp b/extras/Hadrons/Modules/MSink/Point.hpp
index 43be3009..e3bb95fe 100644
--- a/extras/Hadrons/Modules/MSink/Point.hpp
+++ b/extras/Hadrons/Modules/MSink/Point.hpp
@@ -126,7 +126,7 @@ void TPoint<FImpl>::execute(void)
 
         envGetTmp(LatticeComplex, coor);
         p  = strToVec<Real>(par().mom);
-        ph = zero;
+        ph = Zero();
         for(unsigned int mu = 0; mu < env().getNd(); mu++)
         {
             LatticeCoordinate(coor, mu);
diff --git a/extras/Hadrons/Modules/MSource/Point.hpp b/extras/Hadrons/Modules/MSource/Point.hpp
index 1d8241cf..4eb8b05a 100644
--- a/extras/Hadrons/Modules/MSource/Point.hpp
+++ b/extras/Hadrons/Modules/MSource/Point.hpp
@@ -127,7 +127,7 @@ void TPoint<FImpl>::execute(void)
     SitePropagator   id;
     
     id  = 1.;
-    src = zero;
+    src = Zero();
     pokeSite(id, src, position);
 }
 
diff --git a/extras/Hadrons/Modules/MSource/SeqGamma.hpp b/extras/Hadrons/Modules/MSource/SeqGamma.hpp
index abad5ace..8ff9771e 100644
--- a/extras/Hadrons/Modules/MSource/SeqGamma.hpp
+++ b/extras/Hadrons/Modules/MSource/SeqGamma.hpp
@@ -159,7 +159,7 @@ void TSeqGamma<FImpl>::execute(void)
 
         envGetTmp(LatticeComplex, coor);
         p  = strToVec<Real>(par().mom);
-        ph = zero;
+        ph = Zero();
         for(unsigned int mu = 0; mu < env().getNd(); mu++)
         {
             LatticeCoordinate(coor, mu);
diff --git a/extras/Hadrons/Modules/MSource/Wall.hpp b/extras/Hadrons/Modules/MSource/Wall.hpp
index 9d5f1f46..34058b7a 100644
--- a/extras/Hadrons/Modules/MSource/Wall.hpp
+++ b/extras/Hadrons/Modules/MSource/Wall.hpp
@@ -138,7 +138,7 @@ void TWall<FImpl>::execute(void)
 
         envGetTmp(LatticeComplex, coor);
         p  = strToVec<Real>(par().mom);
-        ph = zero;
+        ph = Zero();
         for(unsigned int mu = 0; mu < env().getNd(); mu++)
         {
             LatticeCoordinate(coor, mu);
diff --git a/extras/qed-fvol/WilsonLoops.h b/extras/qed-fvol/WilsonLoops.h
index a4f0e927..8d2f3c43 100644
--- a/extras/qed-fvol/WilsonLoops.h
+++ b/extras/qed-fvol/WilsonLoops.h
@@ -44,7 +44,7 @@ public:
   static void sitePlaquette(LatticeComplex &Plaq,
                             const std::vector<GaugeMat> &U) {
     LatticeComplex sitePlaq(U[0].Grid());
-    Plaq = zero;
+    Plaq = Zero();
     for (int mu = 1; mu < U[0].Grid()->_ndimension; mu++) {
       for (int nu = 0; nu < mu; nu++) {
         traceDirPlaquette(sitePlaq, U, mu, nu);
@@ -123,7 +123,7 @@ public:
                             const std::vector<GaugeMat> &U,
                             const int R1, const int R2) {
     LatticeComplex siteWl(U[0].Grid());
-    Wl = zero;
+    Wl = Zero();
     for (int mu = 1; mu < U[0].Grid()->_ndimension; mu++) {
       for (int nu = 0; nu < mu; nu++) {
         traceWilsonLoop(siteWl, U, R1, R2, mu, nu);
@@ -144,7 +144,7 @@ public:
 
     int ndim = U[0].Grid()->_ndimension;
 
-    Wl = zero;
+    Wl = Zero();
     for (int nu = 0; nu < ndim - 1; nu++) {
       traceWilsonLoop(siteWl, U, R1, R2, ndim-1, nu);
       Wl = Wl + siteWl;
@@ -158,7 +158,7 @@ public:
                             const int R1, const int R2) {
     LatticeComplex siteWl(U[0].Grid());
 
-    Wl = zero;
+    Wl = Zero();
     for (int mu = 1; mu < U[0].Grid()->_ndimension - 1; mu++) {
       for (int nu = 0; nu < mu; nu++) {
         traceWilsonLoop(siteWl, U, R1, R2, mu, nu);