diff --git a/distro/scripts/adl_cots.sh b/distro/scripts/adl_cots.sh
index 04eb0809d999c6c168fcf9330f92515c9cec5304..5694ef6bbe5d1aa4906050271de5053ae061f310 100755
--- a/distro/scripts/adl_cots.sh
+++ b/distro/scripts/adl_cots.sh
@@ -65,7 +65,7 @@ echo "PATH" $PATH
 export LD_LIBRARY_PATH=${USER_COTS_PATH}/lib64:${USER_COTS_PATH}/lib:${LD_LIBRARY_PATH}
 export LD_RUN_PATH=${USER_COTS_PATH}/lib64:${USER_COTS_PATH}/lib:${LD_RUN_PATH}
 export PATH=${USER_COTS_PATH}/bin:$PATH
-
+export LDFLAGS="-L${USER_COTS_PATH}/lib "
 install_the_source (){
     echo ${FUNCNAME[0]}
     # This will download and unpack the requested COT.  If the cot is already present it will not be downloaded.
@@ -473,7 +473,7 @@ mk_hl_region()
     export HDF5_INSTALL_DIR=${USER_COTS_PATH} && \
     linc=`pwd`  && \
     make clean  && \
-    make CC=$CC INCLUDES="$CPPFLAGS -I${USER_COTS_PATH}/include -I$linc/src  $LDFLAGS  -lhdf5 -lhdf5_hl -lm"  && \
+    make CC=$CC INCLUDES="$CPPFLAGS -I${USER_COTS_PATH}/include -I$linc/src $LDFLAGS  -lhdf5 -lhdf5_hl -lm"  && \
     make PREFIX=${USER_COTS_PATH} install  && \
     echo "${FUNCNAME[0]} finished" && \
     return 0
@@ -552,19 +552,20 @@ _rpath_setter() {
 
     DESIRED_RPATH=$1
     ORIGIN_DIRECTORY=$2
-    cd "${ORIGIN_DIRECTORY}"
+    cd $ORIGIN_DIRECTORY
     #EXES=$(ls *)
     EXES=$(find "${ORIGIN_DIRECTORY}" -type f -perm -700)
 
-    printf "Desired %s\n" $DESIRED_RPATH
+    printf "Desired %s\n" '$DESIRED_RPATH'
     for exe in ${EXES}; do
-        printf "Start for %s\n" $exe
-        #patchelf --remove-rpath $exe
-        patchelf --set-rpath ${DESIRED_RPATH} ${exe}
-        patchelf --shrink-rpath ${exe}
-        printf "Final for %s\n" ${exe}
-        patchelf --print-rpath ${exe}
-        ldd ${exe}
+        if [ -e "$exe" ]; then
+            #printf "Start for %s\n" $exe
+            patchelf --set-rpath $DESIRED_RPATH $exe
+            patchelf --shrink-rpath $exe
+            printf "Set rpath for %s\n" $exe
+            #patchelf --print-rpath $exe
+            #ldd $exe
+        fi
     done
 }
 export ADL_HOME=${COTSBASE}/libexec/ADL