diff --git a/Hadrons/Modules/MSource/Point.hpp b/Hadrons/Modules/MSource/Point.hpp
index 082c04e8..2cc1bcd1 100644
--- a/Hadrons/Modules/MSource/Point.hpp
+++ b/Hadrons/Modules/MSource/Point.hpp
@@ -126,6 +126,11 @@ void TPoint<FImpl>::execute(void)
     auto             &src     = envGet(PropagatorField, getName());
     SitePropagator   id;
     
+    if (position.size() != env().getNd())
+    {
+        HADRONS_ERROR(Size, "position has " + std::to_string(position.size())
+                      + " components (must have " + std::to_string(env().getNd()) + ")");
+    }
     id  = 1.;
     src = zero;
     pokeSite(id, src, position);
diff --git a/Hadrons/Utilities/Makefile.am b/Hadrons/Utilities/Makefile.am
index 7655b2e2..529def24 100644
--- a/Hadrons/Utilities/Makefile.am
+++ b/Hadrons/Utilities/Makefile.am
@@ -1,10 +1,8 @@
-AM_LDFLAGS += -L../../Hadrons
-
 bin_PROGRAMS = HadronsXmlRun HadronsFermionEP64To32
 
 HadronsXmlRun_SOURCES = HadronsXmlRun.cc
-HadronsXmlRun_LDADD   = -lHadrons -lGrid
+HadronsXmlRun_LDADD   = ../libHadrons.a ../../Grid/libGrid.a
 
 HadronsFermionEP64To32_SOURCES  = EigenPackCast.cc
 HadronsFermionEP64To32_CXXFLAGS = $(AM_CXXFLAGS) -DFIN=WilsonImplD::FermionField -DFOUT=WilsonImplF::FermionField
-HadronsFermionEP64To32_LDADD    = -lHadrons -lGrid
+HadronsFermionEP64To32_LDADD    = ../libHadrons.a ../../Grid/libGrid.a