diff --git a/Hadrons/Modules/MContraction/A2AMesonField.hpp b/Hadrons/Modules/MContraction/A2AMesonField.hpp
index d3f90959..cf1b9415 100644
--- a/Hadrons/Modules/MContraction/A2AMesonField.hpp
+++ b/Hadrons/Modules/MContraction/A2AMesonField.hpp
@@ -231,6 +231,11 @@ void TA2AMesonField<FImpl>::execute(void)
     int block      = par().block;
     int cacheBlock = par().cacheBlock;
 
+    if (N_i < block || N_j < block)
+    {
+        HADRONS_ERROR(Range, "blockSize must not exceed size of input vector.");
+    }
+
     LOG(Message) << "Computing all-to-all meson fields" << std::endl;
     LOG(Message) << "Left: '" << par().left << "' Right: '" << par().right << "'" << std::endl;
     LOG(Message) << "Momenta:" << std::endl;
diff --git a/Hadrons/Modules/MDistil/Perambulator.cc b/Hadrons/Modules/MDistil/Perambulator.cc
index a1b24a2d..0cd8e5e0 100644
--- a/Hadrons/Modules/MDistil/Perambulator.cc
+++ b/Hadrons/Modules/MDistil/Perambulator.cc
@@ -34,6 +34,7 @@ using namespace Hadrons;
 using namespace MDistil;
 
 template class Grid::Hadrons::MDistil::TPerambulator<FIMPL>;
+template class Grid::Hadrons::MDistil::TPerambulator<ZFIMPL>;
 
 BEGIN_HADRONS_NAMESPACE
 
diff --git a/Hadrons/Modules/MDistil/Perambulator.hpp b/Hadrons/Modules/MDistil/Perambulator.hpp
index 54db5e50..b59d6c51 100644
--- a/Hadrons/Modules/MDistil/Perambulator.hpp
+++ b/Hadrons/Modules/MDistil/Perambulator.hpp
@@ -74,6 +74,7 @@ protected:
 };
 
 MODULE_REGISTER_TMP(Perambulator, TPerambulator<FIMPL>, MDistil);
+MODULE_REGISTER_TMP(ZPerambulator, TPerambulator<ZFIMPL>, MDistil);
 
 /******************************************************************************
  *                 TPerambulator implementation                             *
@@ -102,7 +103,7 @@ std::vector<std::string> TPerambulator<FImpl>::getOutput(void)
     if( !UnsmearedSinkFileName.empty() )
     {
         objName.append( UnsmearedSink );
-        output.emplace_back( objName );
+        output.push_back( objName );
     }
     return output;
 }