diff --git a/DATA/common/setenv_calib.sh b/DATA/common/setenv_calib.sh
index 7d23a5e0a..d0e8d120d 100755
--- a/DATA/common/setenv_calib.sh
+++ b/DATA/common/setenv_calib.sh
@@ -106,8 +106,6 @@ echo CALIBDATASPEC_BARREL = $CALIBDATASPEC_BARREL 1>&2
 echo CALIBDATASPEC_CALO = $CALIBDATASPEC_CALO 1>&2
 
 # proxies properties
-PORT_BARREL=30453
-PORT_CALO=30454
 get_proxy_connection()
 {
   if (( $# < 2 )); then
@@ -117,28 +115,25 @@ get_proxy_connection()
     echo "second parameter is the type of connection (input/output)"
     exit 1
   fi
-  
-  # setting the port
-  if [[ $1 == "barrel" ]]; then
-      local PORT=$PORT_BARREL
-  elif [[ $1 == "calo" ]]; then
-      local PORT=$PORT_CALO
-  else
-      echo "parameter 1 should be either 'barrel' or 'calo'"
-      exit 3
-  fi
 
   # setting the type of connection
   if [[ $2 == "input" ]]; then
       local CONNECTION="method=bind,type=pull"
+      local NAMECONNECTION="--proxy-name"
   elif [[ $2 == "output" ]]; then
       local CONNECTION="method=connect,type=push"
+      local NAMECONNECTION="--proxy-channel-name"
   else
       echo "parameter 2 should be either 'input' or 'output'"
       exit 2
   fi
-  
-  local PROXY_CONN="--proxy-channel-name aggregator-proxy-$1 --channel-config \"name=aggregator-proxy-$1,$CONNECTION,rateLogging=1,transport=zeromq,address=tcp://localhost:$PORT\""
+
+  if workflow_has_parameter CALIB_LOCAL_AGGREGATOR; then
+    CONNECTION+=",transport=shmem,address=ipc://${UDS_PREFIX}aggregator-shm-$1"
+  else
+    CONNECTION+=",transport=zeromq"
+  fi
+  local PROXY_CONN="$NAMECONNECTION aggregator-proxy-$1 --channel-config \"name=aggregator-proxy-$1,$CONNECTION,rateLogging=1\""
 
   echo PROXY_CONN = $PROXY_CONN 1>&2
   echo $PROXY_CONN
diff --git a/DATA/tools/epn/gen_topo.sh b/DATA/tools/epn/gen_topo.sh
index 70c315fc6..a5c8624bc 100755
--- a/DATA/tools/epn/gen_topo.sh
+++ b/DATA/tools/epn/gen_topo.sh
@@ -37,7 +37,7 @@ else
   # Note that this does not load the module, but just needs an O2DPG path to find, which then does the bulk of the topology generation.
   # gen_topo_o2dpg.sh is kept compatible between O2DPG versions, thus it doesn't really depend on which O2DPG version we use at this point.
   if [[ -z $O2DPG_ROOT ]]; then
-    O2DPG_ROOT=`bash -c "module load O2DPG > /dev/null; echo \\\$O2DPG_ROOT;"`
+    O2DPG_ROOT=`bash -c "module load O2DPG &> /dev/null; echo \\\$O2DPG_ROOT;"`
   fi
 fi
 # Now we know which gen_topo_o2dpg.sh we can use, and all EPN related env variables are set, so we can run the topology generation.