diff --git a/configure.ac b/configure.ac
index 99b94671de..45f58cf89a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -564,7 +564,7 @@ AS_IF([test -n "$deps_libdir"],
 
         [AM_LDFLAGS="$AM_LDFLAGS -Wl,-rpath,$deps_libdir"
          AS_IF([test -n "$deps_libdir64"], [AM_LDFLAGS="$AM_LDFLAGS -Wl,-rpath,$deps_libdir64"])
-         AM_LDFLAGS="$AM_LDFLAGS -Wl,-rpath,'\$ORIGIN'"])
+         AM_LDFLAGS="$AM_LDFLAGS -Wl,-rpath,'\$\$ORIGIN'"])
     AC_MSG_NOTICE([Set Automake linker flags to $AM_LDFLAGS])
     AC_SUBST([AM_LDFLAGS])])
 
@@ -830,7 +830,7 @@ AS_IF([test -n "$with_gdal_prefix" -a $with_gdal_prefix = no],
     # Add the OS-specific shared linker syntax for the rpath option. jhrg 4/10/26
     AM_COND_IF([DARWIN],
         [GDAL_LDFLAGS="$GDAL_LDFLAGS -Wl,-rpath,@loader_path"],
-        [GDAL_LDFLAGS="$GDAL_LDFLAGS -Wl,-rpath,'\$ORIGIN'"])
+        [GDAL_LDFLAGS="$GDAL_LDFLAGS -Wl,-rpath,'\$\$ORIGIN'"])
 
     # The newer versions of gdal-config have a --dep-libs option that includes 
     # the libs of the dependencies. We need to use that to get the proj library, 
diff --git a/modules/dmrpp_module/Makefile.am b/modules/dmrpp_module/Makefile.am
index b2cdb9aa8e..5698688c92 100644
--- a/modules/dmrpp_module/Makefile.am
+++ b/modules/dmrpp_module/Makefile.am
@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I conf
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/dispatch -I$(top_srcdir)/dap -I$(top_srcdir)/xmlcommand \
     -I$(top_srcdir)/http -I$(top_srcdir)/modules/dmrpp_module/ngap_container -I$(top_srcdir)/pugixml/src $(DAP_CFLAGS)
-AM_CXXFLAGS = -Wno-vla-extension -Wno-inconsistent-missing-override
+AM_CXXFLAGS = $(CXXFLAGS) -Wno-vla-extension -Wno-inconsistent-missing-override
 
 AM_CPPFLAGS += $(OPENSSL_INC)
 
@@ -22,7 +22,7 @@ AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\"  -DMODULE_VERSION=\"$(M_VER)\"
 # the --disable-shared is not required, but it seems to help with debuggers.
 CXXFLAGS_DEBUG = -g3 -O0  -Wall -W -Wcast-align 
 
-AM_LDFLAGS = 
+# Do not initialize AM_LDFLAGS here; configure may set dependency rpath flags.
 include $(top_srcdir)/coverage.mk
 
 SUBDIRS = ngap_container dmrpp_transmitter build_dmrpp_h4 . unit-tests tests data tests_build_dmrpp get_dmrpp
@@ -49,7 +49,7 @@ vlsa_util.h float_byteswap.h
 DMRPP_MODULE = DmrppModule.cc DmrppRequestHandler.cc DmrppModule.h DmrppRequestHandler.h
 
 libdmrpp_module_la_SOURCES = $(BES_HDRS) $(BES_SRCS) $(DMRPP_MODULE)
-libdmrpp_module_la_LDFLAGS = -avoid-version -module
+libdmrpp_module_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -module
 libdmrpp_module_la_LIBADD = -L$(builddir)/ngap_container -lngap $(BES_DISPATCH_LIB) \
     $(BES_HTTP_LIB) $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) \
     $(H5_LDFLAGS) $(H5_LIBS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) -ltest-types \
@@ -68,7 +68,7 @@ h5common.h: Makefile
 build_dmrpp_CPPFLAGS = $(AM_CPPFLAGS) $(H5_CPPFLAGS) -I$(top_srcdir)/modules/hdf5_handler
 build_dmrpp_SOURCES = $(BES_SRCS) $(BES_HDRS) DmrppRequestHandler.cc DmrppRequestHandler.h \
     build_dmrpp.cc build_dmrpp_util.cc build_dmrpp_util.h h5common.cc h5common.h
-build_dmrpp_LDFLAGS = $(top_builddir)/dap/.libs/libdap_module.a
+build_dmrpp_LDFLAGS = $(AM_LDFLAGS) $(top_builddir)/dap/.libs/libdap_module.a
 build_dmrpp_LDADD = $(BES_DISPATCH_LIB) $(BES_HTTP_LIB) -L$(builddir)/ngap_container -lngap \
     $(H5_LDFLAGS) $(H5_LIBS) $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) \
     $(XML2_LIBS) $(BYTESWAP_LIBS) -lz
diff --git a/modules/dmrpp_module/build_dmrpp_h4/Makefile.am b/modules/dmrpp_module/build_dmrpp_h4/Makefile.am
index 5cc1ccc21e..c8da39d4f3 100644
--- a/modules/dmrpp_module/build_dmrpp_h4/Makefile.am
+++ b/modules/dmrpp_module/build_dmrpp_h4/Makefile.am
@@ -19,7 +19,6 @@ AM_CPPFLAGS = $(HDF4_CFLAGS) $(HDFEOS2_CPPFLAGS) -I$(top_srcdir) -I$(top_srcdir)
 AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\"
 
 AM_CXXFLAGS=
-AM_LDFLAGS =
 include $(top_srcdir)/coverage.mk
 
 bin_PROGRAMS = build_dmrpp_h4
@@ -39,7 +38,7 @@ HDR = build_dmrpp_util_h4.h ../Chunk.h ../DMRpp.h ../DMZ.h ../DmrppArray.h ../Dm
     ../DmrppRequestHandler.h ../CurlHandlePool.h ../vlsa_util.h ../byteswap_compat.h ../float_byteswap.h
 
 build_dmrpp_h4_CPPFLAGS = $(AM_CPPFLAGS)
-build_dmrpp_h4_LDFLAGS = $(HDFEOS2_LDFLAGS) $(HDF4_LDFLAGS) $(BES_DAP_LIB_LDFLAGS)
+build_dmrpp_h4_LDFLAGS = $(AM_LDFLAGS) $(HDFEOS2_LDFLAGS) $(HDF4_LDFLAGS) $(BES_DAP_LIB_LDFLAGS)
 build_dmrpp_h4_LDADD = $(BES_DISPATCH_LIB) $(BES_HTTP_LIB) -L$(builddir)/../ngap_container -lngap \
 $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) $(XML2_LIBS) \
 $(BYTESWAP_LIBS) $(HDFEOS2_LIBS) $(HDF4_LIBS)
@@ -58,5 +57,3 @@ C4_DIR=./cccc
 .PHONY: cccc
 cccc:	
 	cccc --outdir=$(C4_DIR) $(CMR_SRC) $(CMR_HDR)
-
-
diff --git a/modules/dmrpp_module/dmrpp_transmitter/Makefile.am b/modules/dmrpp_module/dmrpp_transmitter/Makefile.am
index 0bbec6fc7e..ba28909cd1 100644
--- a/modules/dmrpp_module/dmrpp_transmitter/Makefile.am
+++ b/modules/dmrpp_module/dmrpp_transmitter/Makefile.am
@@ -8,7 +8,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/dap -I$(top_srcdir)/dispatch -I$(top_srcdir)/http
     -I$(top_srcdir)/modules/dmrpp_module/ngap_container
 
 AM_CXXFLAGS =
-AM_LDFLAGS = $(DMRPP_LDFLAGS)
+# Preserve configure-provided dependency rpath flags, then add DMR++ flags.
+AM_LDFLAGS += $(DMRPP_LDFLAGS)
 LIBADD = $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS)
 
 if COMPILER_IS_GCC
diff --git a/modules/dmrpp_module/get_dmrpp/unit-tests/grid_1_2d.h5.dmrpp.baseline b/modules/dmrpp_module/get_dmrpp/unit-tests/grid_1_2d.h5.dmrpp.baseline
index 6a66404752..78f8075981 100644
--- a/modules/dmrpp_module/get_dmrpp/unit-tests/grid_1_2d.h5.dmrpp.baseline
+++ b/modules/dmrpp_module/get_dmrpp/unit-tests/grid_1_2d.h5.dmrpp.baseline
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dmrpp="http://xml.opendap.org/dap/dmrpp/1.0.0#" dapVersion="4.0" dmrVersion="removed" name="grid_1_2d.h5" dmrpp:href="OPeNDAP_DMRpp_DATA_ACCESS_URL" dmrpp:version="3.21.1">
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dmrpp="http://xml.opendap.org/dap/dmrpp/1.0.0#" dapVersion="4.0" dmrVersion="1.0" name="grid_1_2d.h5" dmrpp:href="OPeNDAP_DMRpp_DATA_ACCESS_URL" dmrpp:version="3.21.1">
     <Dimension name="lon" size="8"/>
     <Dimension name="lat" size="4"/>
     <Float32 name="lon">
@@ -9,7 +9,7 @@
         </Attribute>
         <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
             <dmrpp:chunkDimensionSizes>8</dmrpp:chunkDimensionSizes>
-            <dmrpp:chunk offset="5313" nBytes="33" chunkPositionInArray="[0]" href="grid_1_2d.h5_mvs.h5" />
+            <dmrpp:chunk offset="5312" nBytes="33" chunkPositionInArray="[0]" href="grid_1_2d.h5_mvs.h5" />
         </dmrpp:chunks>
     </Float32>
     <Float32 name="lat">
@@ -19,7 +19,7 @@
         </Attribute>
         <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
             <dmrpp:chunkDimensionSizes>4</dmrpp:chunkDimensionSizes>
-            <dmrpp:chunk offset="5346" nBytes="22" chunkPositionInArray="[0]" href="grid_1_2d.h5_mvs.h5" />
+            <dmrpp:chunk offset="5345" nBytes="22" chunkPositionInArray="[0]" href="grid_1_2d.h5_mvs.h5" />
         </dmrpp:chunks>
     </Float32>
     <Float32 name="temperature">
@@ -70,7 +70,7 @@
     </Attribute>
     <Attribute name="build_dmrpp_metadata" type="Container">
         <Attribute name="created" type="String">
-            <Value>2025-11-11T13:44:29Z</Value>
+            <Value>2026-04-29T17:58:18Z</Value>
         </Attribute>
         <Attribute name="build_dmrpp" type="String">
             <Value>3.21.1</Value>
@@ -82,7 +82,7 @@
             <Value>libdap-3.21.1</Value>
         </Attribute>
         <Attribute name="invocation" type="String">
-            <Value>build_dmrpp -f /Users/myang6/work/opendap/hyrax-1913-test/bes/modules/dmrpp_module/get_dmrpp/unit-tests/grid_1_2d.h5 -r grid_1_2d.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M</Value>
+            <Value>build_dmrpp -f /home/rocky/kent/hyrax-2121-test/bes/modules/dmrpp_module/get_dmrpp/unit-tests/grid_1_2d.h5 -r grid_1_2d.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M</Value>
         </Attribute>
     </Attribute>
 </Dataset>
diff --git a/modules/dmrpp_module/get_dmrpp/unit-tests/grid_2_2d_sin.h5.dmrpp.baseline b/modules/dmrpp_module/get_dmrpp/unit-tests/grid_2_2d_sin.h5.dmrpp.baseline
index 2f7d45a7c6..41ee552a4a 100644
--- a/modules/dmrpp_module/get_dmrpp/unit-tests/grid_2_2d_sin.h5.dmrpp.baseline
+++ b/modules/dmrpp_module/get_dmrpp/unit-tests/grid_2_2d_sin.h5.dmrpp.baseline
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dmrpp="http://xml.opendap.org/dap/dmrpp/1.0.0#" dapVersion="4.0" dmrVersion="removed" name="grid_2_2d_sin.h5" dmrpp:href="OPeNDAP_DMRpp_DATA_ACCESS_URL" dmrpp:version="3.21.1">
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dmrpp="http://xml.opendap.org/dap/dmrpp/1.0.0#" dapVersion="4.0" dmrVersion="1.0" name="grid_2_2d_sin.h5" dmrpp:href="OPeNDAP_DMRpp_DATA_ACCESS_URL" dmrpp:version="3.21.1">
     <Attribute name="build_dmrpp_metadata" type="Container">
         <Attribute name="created" type="String">
-            <Value>2026-03-26T14:41:34Z</Value>
+            <Value>2026-04-29T18:03:20Z</Value>
         </Attribute>
         <Attribute name="build_dmrpp" type="String">
             <Value>3.21.1</Value>
@@ -14,7 +14,7 @@
             <Value>libdap-3.21.1</Value>
         </Attribute>
         <Attribute name="invocation" type="String">
-            <Value>build_dmrpp -f /Users/myang6/work/opendap/hyrax-2043/bes/modules/dmrpp_module/get_dmrpp/unit-tests/grid_2_2d_sin.h5 -r grid_2_2d_sin.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M</Value>
+            <Value>build_dmrpp -f /home/rocky/kent/hyrax-2121-test/bes/modules/dmrpp_module/get_dmrpp/unit-tests/grid_2_2d_sin.h5 -r grid_2_2d_sin.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M</Value>
         </Attribute>
     </Attribute>
     <Group name="HDFEOS">
@@ -56,7 +56,7 @@
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>2</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="26160" nBytes="25" chunkPositionInArray="[0]" href="grid_2_2d_sin.h5_mvs.h5" />
+                        <dmrpp:chunk offset="26159" nBytes="25" chunkPositionInArray="[0]" href="grid_2_2d_sin.h5_mvs.h5" />
                     </dmrpp:chunks>
                 </Float64>
                 <Float64 name="YDim">
@@ -75,7 +75,7 @@
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>2</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="26185" nBytes="24" chunkPositionInArray="[0]" href="grid_2_2d_sin.h5_mvs.h5" />
+                        <dmrpp:chunk offset="26184" nBytes="24" chunkPositionInArray="[0]" href="grid_2_2d_sin.h5_mvs.h5" />
                     </dmrpp:chunks>
                 </Float64>
                 <Float64 name="Latitude">
@@ -86,7 +86,7 @@
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>2 2</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="26209" nBytes="28" chunkPositionInArray="[0,0]" href="grid_2_2d_sin.h5_mvs.h5" />
+                        <dmrpp:chunk offset="26208" nBytes="28" chunkPositionInArray="[0,0]" href="grid_2_2d_sin.h5_mvs.h5" />
                     </dmrpp:chunks>
                 </Float64>
                 <Float64 name="Longitude">
@@ -97,7 +97,7 @@
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>2 2</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="26237" nBytes="41" chunkPositionInArray="[0,0]" href="grid_2_2d_sin.h5_mvs.h5" />
+                        <dmrpp:chunk offset="26236" nBytes="41" chunkPositionInArray="[0,0]" href="grid_2_2d_sin.h5_mvs.h5" />
                     </dmrpp:chunks>
                 </Float64>
                 <Group name="Data_Fields">
@@ -156,7 +156,7 @@
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>4</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="37804" nBytes="43" chunkPositionInArray="[0]" href="grid_2_2d_sin.h5_mvs.h5" />
+                        <dmrpp:chunk offset="37803" nBytes="43" chunkPositionInArray="[0]" href="grid_2_2d_sin.h5_mvs.h5" />
                     </dmrpp:chunks>
                 </Float64>
                 <Float64 name="YDim">
@@ -175,7 +175,7 @@
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>4</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="37847" nBytes="40" chunkPositionInArray="[0]" href="grid_2_2d_sin.h5_mvs.h5" />
+                        <dmrpp:chunk offset="37846" nBytes="40" chunkPositionInArray="[0]" href="grid_2_2d_sin.h5_mvs.h5" />
                     </dmrpp:chunks>
                 </Float64>
                 <Float64 name="Latitude">
@@ -186,7 +186,7 @@
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>4 4</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="37887" nBytes="46" chunkPositionInArray="[0,0]" href="grid_2_2d_sin.h5_mvs.h5" />
+                        <dmrpp:chunk offset="37886" nBytes="46" chunkPositionInArray="[0,0]" href="grid_2_2d_sin.h5_mvs.h5" />
                     </dmrpp:chunks>
                 </Float64>
                 <Float64 name="Longitude">
@@ -197,7 +197,7 @@
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>4 4</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="37933" nBytes="139" chunkPositionInArray="[0,0]" href="grid_2_2d_sin.h5_mvs.h5" />
+                        <dmrpp:chunk offset="37932" nBytes="139" chunkPositionInArray="[0,0]" href="grid_2_2d_sin.h5_mvs.h5" />
                     </dmrpp:chunks>
                 </Float64>
                 <Group name="Data_Fields">
diff --git a/modules/dmrpp_module/ngap_container/Makefile.am b/modules/dmrpp_module/ngap_container/Makefile.am
index ecd6d3c059..3214728485 100644
--- a/modules/dmrpp_module/ngap_container/Makefile.am
+++ b/modules/dmrpp_module/ngap_container/Makefile.am
@@ -12,7 +12,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/dispatch -I$(top_srcdir)/dap -I$(t
 LIBADD =
 
 AM_CXXFLAGS=
-AM_LDFLAGS =
 include $(top_srcdir)/coverage.mk
 
 SUBDIRS = . unit-tests
@@ -41,5 +40,3 @@ C4_DIR=./cccc
 .PHONY: cccc
 cccc:	
 	cccc --outdir=$(C4_DIR) $(NGAP_SRC) $(NGAP_HDR)
-
-
diff --git a/modules/dmrpp_module/ngap_container/unit-tests/Makefile.am b/modules/dmrpp_module/ngap_container/unit-tests/Makefile.am
index 29673eed03..9a92971616 100644
--- a/modules/dmrpp_module/ngap_container/unit-tests/Makefile.am
+++ b/modules/dmrpp_module/ngap_container/unit-tests/Makefile.am
@@ -22,7 +22,6 @@ endif
 CXXFLAGS_DEBUG = -g3 -O0  -Wall -W -Wcast-align -Werror
 
 AM_CXXFLAGS=
-AM_LDFLAGS =
 include $(top_srcdir)/coverage.mk
 
 DISTCLEANFILES = test_config.h *.Po
@@ -107,4 +106,3 @@ NgapApiTest_LDADD =  $(LIBADD)
 
 NgapOwnedContainerTest_SOURCES = NgapOwnedContainerTest.cc
 NgapOwnedContainerTest_LDADD = $(LIBADD)
-
diff --git a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_data_url_dmrpp.baseline b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_data_url_dmrpp.baseline
index ac70ca067b..9a71d64f6d 100644
--- a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_data_url_dmrpp.baseline
+++ b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_data_url_dmrpp.baseline
@@ -9,7 +9,7 @@
         </Attribute>
         <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
             <dmrpp:chunkDimensionSizes>8</dmrpp:chunkDimensionSizes>
-            <dmrpp:chunk offset="3217" nBytes="33" chunkPositionInArray="[0]" href="http://some.where.over.the.rainbow.oz" />
+            <dmrpp:chunk offset="3216" nBytes="33" chunkPositionInArray="[0]" href="http://some.where.over.the.rainbow.oz" />
         </dmrpp:chunks>
     </Float32>
     <Float32 name="lat">
@@ -19,7 +19,7 @@
         </Attribute>
         <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
             <dmrpp:chunkDimensionSizes>4</dmrpp:chunkDimensionSizes>
-            <dmrpp:chunk offset="5346" nBytes="22" chunkPositionInArray="[0]" href="http://some.where.over.the.rainbow.oz" />
+            <dmrpp:chunk offset="5345" nBytes="22" chunkPositionInArray="[0]" href="http://some.where.over.the.rainbow.oz" />
         </dmrpp:chunks>
     </Float32>
     <Float32 name="temperature">
diff --git a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_dmrpp.baseline b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_dmrpp.baseline
index eded97eca8..d157565ea2 100644
--- a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_dmrpp.baseline
+++ b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_dmrpp.baseline
@@ -9,7 +9,7 @@
         </Attribute>
         <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
             <dmrpp:chunkDimensionSizes>8</dmrpp:chunkDimensionSizes>
-            <dmrpp:chunk offset="3217" nBytes="33" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
+            <dmrpp:chunk offset="3216" nBytes="33" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
         </dmrpp:chunks>
     </Float32>
     <Float32 name="lat">
@@ -19,7 +19,7 @@
         </Attribute>
         <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
             <dmrpp:chunkDimensionSizes>4</dmrpp:chunkDimensionSizes>
-            <dmrpp:chunk offset="5346" nBytes="22" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
+            <dmrpp:chunk offset="5345" nBytes="22" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
         </dmrpp:chunks>
     </Float32>
     <Float32 name="temperature">
diff --git a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp.baseline b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp.baseline
index 9dcf2299e5..21ce609e2b 100644
--- a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp.baseline
+++ b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp.baseline
@@ -52,7 +52,7 @@ H5.EnableCheckNameClashing=true
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>8</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="7936" nBytes="33" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
+                        <dmrpp:chunk offset="7935" nBytes="33" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
                     </dmrpp:chunks>
                 </Float32>
                 <Float32 name="XDim">
@@ -62,7 +62,7 @@ H5.EnableCheckNameClashing=true
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>16</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="7969" nBytes="54" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
+                        <dmrpp:chunk offset="7968" nBytes="54" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
                     </dmrpp:chunks>
                 </Float32>
                 <Group name="Data_Fields">
@@ -91,7 +91,7 @@ H5.EnableCheckNameClashing=true
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>4</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="12215" nBytes="22" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
+                        <dmrpp:chunk offset="12214" nBytes="22" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
                     </dmrpp:chunks>
                 </Float32>
                 <Float32 name="XDim">
@@ -101,7 +101,7 @@ H5.EnableCheckNameClashing=true
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>8</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="12237" nBytes="33" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
+                        <dmrpp:chunk offset="12236" nBytes="33" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
                     </dmrpp:chunks>
                 </Float32>
                 <Group name="Data_Fields">
diff --git a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp_comp.baseline b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp_comp.baseline
index 199726dfc2..2d564afa10 100644
--- a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp_comp.baseline
+++ b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp_comp.baseline
@@ -76,7 +76,7 @@ H5.EnableCheckNameClashing=true
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>2</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="26160" nBytes="25" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
+                        <dmrpp:chunk offset="26159" nBytes="25" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
                     </dmrpp:chunks>
                 </Float64>
                 <Float64 name="YDim">
@@ -95,7 +95,7 @@ H5.EnableCheckNameClashing=true
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>2</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="26185" nBytes="24" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
+                        <dmrpp:chunk offset="26184" nBytes="24" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
                     </dmrpp:chunks>
                 </Float64>
                 <Float64 name="Latitude">
@@ -106,7 +106,7 @@ H5.EnableCheckNameClashing=true
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>2 2</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="26209" nBytes="28" chunkPositionInArray="[0,0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
+                        <dmrpp:chunk offset="26208" nBytes="28" chunkPositionInArray="[0,0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
                     </dmrpp:chunks>
                 </Float64>
                 <Float64 name="Longitude">
@@ -117,7 +117,7 @@ H5.EnableCheckNameClashing=true
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>2 2</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="26237" nBytes="41" chunkPositionInArray="[0,0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
+                        <dmrpp:chunk offset="26236" nBytes="41" chunkPositionInArray="[0,0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
                     </dmrpp:chunks>
                 </Float64>
                 <Group name="Data_Fields">
@@ -176,7 +176,7 @@ H5.EnableCheckNameClashing=true
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>4</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="37804" nBytes="43" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
+                        <dmrpp:chunk offset="37803" nBytes="43" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
                     </dmrpp:chunks>
                 </Float64>
                 <Float64 name="YDim">
@@ -195,7 +195,7 @@ H5.EnableCheckNameClashing=true
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>4</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="37847" nBytes="40" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
+                        <dmrpp:chunk offset="37846" nBytes="40" chunkPositionInArray="[0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
                     </dmrpp:chunks>
                 </Float64>
                 <Float64 name="Latitude">
@@ -206,7 +206,7 @@ H5.EnableCheckNameClashing=true
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>4 4</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="37887" nBytes="46" chunkPositionInArray="[0,0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
+                        <dmrpp:chunk offset="37886" nBytes="46" chunkPositionInArray="[0,0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
                     </dmrpp:chunks>
                 </Float64>
                 <Float64 name="Longitude">
@@ -217,7 +217,7 @@ H5.EnableCheckNameClashing=true
                     </Attribute>
                     <dmrpp:chunks compressionType="deflate" deflateLevel="4" fillValue="0" byteOrder="LE">
                         <dmrpp:chunkDimensionSizes>4 4</dmrpp:chunkDimensionSizes>
-                        <dmrpp:chunk offset="37933" nBytes="139" chunkPositionInArray="[0,0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
+                        <dmrpp:chunk offset="37932" nBytes="139" chunkPositionInArray="[0,0]" href="OPeNDAP_DMRpp_MISSING_DATA_ACCESS_URL" />
                     </dmrpp:chunks>
                 </Float64>
                 <Group name="Data_Fields">
diff --git a/modules/dmrpp_module/unit-tests/Makefile.am b/modules/dmrpp_module/unit-tests/Makefile.am
index b9cad3c4af..0a4c81aa32 100644
--- a/modules/dmrpp_module/unit-tests/Makefile.am
+++ b/modules/dmrpp_module/unit-tests/Makefile.am
@@ -29,7 +29,6 @@ endif
 CXXFLAGS_DEBUG = -g3 -O0  -Wall -Wcast-align
 
 AM_CXXFLAGS = -Wno-vla-extension -Wno-inconsistent-missing-override -Wno-unused-variable
-AM_LDFLAGS =
 include $(top_srcdir)/coverage.mk
 
 # This determines what gets built by make check
@@ -129,5 +128,3 @@ build_dmrpp_util_test_LDADD = $(H5_LDFLAGS) $(H5_LIBS) ../.libs/libdmrpp_module.
 
 vlsa_util_test_SOURCES = vlsa_util_test.cc
 vlsa_util_test_LDADD   = ../.libs/libdmrpp_module.a $(LIBADD)
-
-
diff --git a/modules/hdf5_handler/Makefile.am b/modules/hdf5_handler/Makefile.am
index f364daf495..f4bafdb8fe 100644
--- a/modules/hdf5_handler/Makefile.am
+++ b/modules/hdf5_handler/Makefile.am
@@ -30,8 +30,7 @@ AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\"
 
 BUILT_SOURCES = $(GRAM_SRCS)
 
-AM_CXXFLAGS=
-AM_LDFLAGS =
+AM_CXXFLAGS = $(CXXFLAGS)
 include $(top_srcdir)/coverage.mk
 
 SUBDIRS = gctp . bes-testsuite 
@@ -77,7 +76,7 @@ SERVER_HDR = HDF5RequestHandler.h HDF5Module.h HDF5_DDS.h HDF5_DMR.h HDF5_DataMe
 
 libhdf5_module_la_SOURCES = $(HDF5DTYPE_SRCS) $(HDF5_SRCS) $(HDF5CFDTYPE_SRCS) $(HDF5CF_SRCS) $(SERVER_SRC) $(HDF5CFDTYPE_HDRS) $(HDF5CF_HDRS) $(HDF5DTYPE_HDRS) $(HDF5_HDRS) $(SERVER_HDR)
 # libhdf5_module_la_CPPFLAGS = $(BES_CPPFLAGS)
-libhdf5_module_la_LDFLAGS = -avoid-version -module 
+libhdf5_module_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -module 
 libhdf5_module_la_LIBADD = $(LIBADD)
 
 EXTRA_DIST = he5das.yy he5dds.yy he5das.lex he5dds.lex OSX_Resources \
diff --git a/modules/hdf5_handler/README b/modules/hdf5_handler/README
index 121098d6e3..8e7eeb7c74 100644
--- a/modules/hdf5_handler/README
+++ b/modules/hdf5_handler/README
@@ -1,9 +1,11 @@
+
 This file describes the HDF5 handler developed by The HDF Group and OPeNDAP, 
 Inc. under a grant from NASA. For information about building the HDF5 handler,
 see the INSTALL. For comprehensive information about the HDF5 handler, check 
 https://github.com/OPENDAP/hyrax_guide/blob/master/handlers/BES_Modules_The_HDF5_Handler.adoc
 and https://hdfeos.org/software/hdf5_handler.php
 
+We are in the process of using the HDF5 2.1.1.
 
 What's new for Hyrax 1.16.9
 1. CF option