diff --git a/extras/Hadrons/Modules/MScalar/ScalarVP.cc b/extras/Hadrons/Modules/MScalar/ScalarVP.cc
index 66cdea7e..79cc5574 100644
--- a/extras/Hadrons/Modules/MScalar/ScalarVP.cc
+++ b/extras/Hadrons/Modules/MScalar/ScalarVP.cc
@@ -1,4 +1,5 @@
 #include <Grid/Hadrons/Modules/MScalar/ScalarVP.hpp>
+#include <Grid/Hadrons/Modules/MScalar/Scalar.hpp>
 
 using namespace Grid;
 using namespace Hadrons;
@@ -46,7 +47,7 @@ void TScalarVP::setup(void)
 	for (unsigned int mu = 0; mu < env().getNd(); ++mu)
     {
         phaseName_.push_back("_shiftphase_" + std::to_string(mu));
-        muGFSrcName.push_back("_" + getName() + "_DinvSrc_" + std::to_string(mu));
+        muGFSrcName_.push_back("_" + getName() + "_DinvSrc_" + std::to_string(mu));
         muProp0Name_.push_back(getName() + "_prop0_" + std::to_string(mu));
         muPropQName_.push_back(getName() + "_propQ_" + std::to_string(mu));
         muPropSunName_.push_back(getName() + "_propSun_" + std::to_string(mu));
diff --git a/extras/Hadrons/Modules/MScalar/ScalarVP.hpp b/extras/Hadrons/Modules/MScalar/ScalarVP.hpp
index 9d57a62a..1a2b82fb 100644
--- a/extras/Hadrons/Modules/MScalar/ScalarVP.hpp
+++ b/extras/Hadrons/Modules/MScalar/ScalarVP.hpp
@@ -42,16 +42,19 @@ public:
     // execution
     virtual void execute(void);
 private:
+    void chargedProp(ScalarField &prop_q, ScalarField &prop_sun,
+                            ScalarField &prop_tad, ScalarField &GFSrc,
+                            FFT &fft);
     void momD1(ScalarField &s, FFT &fft);
     void momD2(ScalarField &s, FFT &fft);
 private:
     std::string                 freeMomPropName_, GFSrcName_, prop0Name_,
                                 propQName_, propSunName_, propTadName_;
     std::vector<std::string>    phaseName_, muGFSrcName_, muProp0Name_,
-                                muPropQName, muPropSunName_, muPropTadName_;
+                                muPropQName_, muPropSunName_, muPropTadName_;
     ScalarField                 *freeMomProp_, *GFSrc_, *prop0_;
     std::vector<ScalarField *>  phase_, muGFSrc_, muProp0_;
-    emField                     *A;
+    EmField                     *A;
 };
 
 MODULE_REGISTER_NS(ScalarVP, TScalarVP, MScalar);