diff --git a/ecf/defs/hafs.def.prod b/ecf/defs/hafs.def.prod
index b4136654e..17d3ccf60 100644
--- a/ecf/defs/hafs.def.prod
+++ b/ecf/defs/hafs.def.prod
@@ -69,7 +69,7 @@ suite prod
         edit QUEUE_ARCH 'prod_transfer'
         edit NET 'hafs'
         edit PROJ 'HAFS'
-        edit hafs_ver 'v1.0.3'
+        edit hafs_ver 'v1.0.4'
         edit PACKAGEHOME '/lfs/h1/ops/%ENVIR%/packages/hafs.%hafs_ver%'
         edit VER '_%hafs_ver%'
         edit PARATEST 'YES'
@@ -1912,7 +1912,7 @@ suite prod
         edit QUEUE_ARCH 'prod_transfer'
         edit NET 'hafs'
         edit PROJ 'HAFS'
-        edit hafs_ver 'v1.0.3'
+        edit hafs_ver 'v1.0.4'
         edit PACKAGEHOME '/lfs/h1/ops/%ENVIR%/packages/hafs.%hafs_ver%'
         edit VER '_%hafs_ver%'
         edit PARATEST 'YES'
@@ -3755,7 +3755,7 @@ suite prod
         edit QUEUE_ARCH 'prod_transfer'
         edit NET 'hafs'
         edit PROJ 'HAFS'
-        edit hafs_ver 'v1.0.3'
+        edit hafs_ver 'v1.0.4'
         edit PACKAGEHOME '/lfs/h1/ops/%ENVIR%/packages/hafs.%hafs_ver%'
         edit VER '_%hafs_ver%'
         edit PARATEST 'YES'
@@ -5598,7 +5598,7 @@ suite prod
         edit QUEUE_ARCH 'prod_transfer'
         edit NET 'hafs'
         edit PROJ 'HAFS'
-        edit hafs_ver 'v1.0.3'
+        edit hafs_ver 'v1.0.4'
         edit PACKAGEHOME '/lfs/h1/ops/%ENVIR%/packages/hafs.%hafs_ver%'
         edit VER '_%hafs_ver%'
         edit PARATEST 'YES'
diff --git a/scripts/exhafs_atm_vi.sh b/scripts/exhafs_atm_vi.sh
index 4eec97f30..20a7844cf 100755
--- a/scripts/exhafs_atm_vi.sh
+++ b/scripts/exhafs_atm_vi.sh
@@ -121,7 +121,7 @@ if [[ ${vmax_vit} -ge ${vi_warm_start_vmax_threshold} ]] && [ -d ${RESTARTinp} ]
     work_dir=${DATA}/prep_guess
     mkdir -p ${work_dir}
     cd ${work_dir}
-    ${APRUNC} ${DATOOL} hafsvi_preproc \
+    ${APRUNM} ${DATOOL} hafsvi_preproc \
         --in_dir=${RESTARTinp} \
         --debug_level=1 --interpolation_points=5 \
         --infile_date=${CDATE:0:8}.${CDATE:8:2}0000 \
@@ -151,7 +151,7 @@ for vortexradius in 30 45; do
   work_dir=${DATA}/prep_init
   mkdir -p ${work_dir}
   cd ${work_dir}
-  ${APRUNC} ${DATOOL} hafsvi_preproc \
+  ${APRUNM} ${DATOOL} hafsvi_preproc \
       --in_dir=${RESTARTinit} \
       --debug_level=1 --interpolation_points=5 \
       --infile_date=${CDATE:0:8}.${CDATE:8:2}0000 \
@@ -185,8 +185,11 @@ if [[ ${vmax_vit} -ge ${vi_warm_start_vmax_threshold} ]] && [ -d ${RESTARTinp} ]
     ${NCP} ${COMOLD}/${old_out_prefix}.${RUN}.trak.atcfunix.all ./trak.atcfunix.all
     # rename basin id for Southern Hemisphere or Northern Indian Ocean storms
 	sed -i -e 's/^AA/IO/g' -e 's/^BB/IO/g' -e 's/^SP/SH/g' -e 's/^SI/SH/g' -e 's/^SQ/SL/g' ./trak.atcfunix.all
-    grep "^${pubbasin2^^}, ${STORMID:0:2}," trak.atcfunix.all \
-      > trak.atcfunix.tmp
+    if grep "^${pubbasin2^^}, ${old_out_prefix_nodate:0:2}," trak.atcfunix.all > trak.atcfunix.tmp ; then
+      echo "trak.atcfunix.tmp generated."
+    else
+      touch trak.atcfunix.tmp
+    fi
   else
     touch trak.atcfunix.tmp
   fi
@@ -523,7 +526,7 @@ ${NCP} -rp ${RESTARTdst}/grid_*spec*.nc ${RESTARTout}/
 ${NCP} -rp ${RESTARTdst}/oro_data*.nc ${RESTARTout}/
 
 for nd in $(seq 1 ${nest_grids}); do
-  ${APRUNC} ${DATOOL} hafsvi_postproc \
+  ${APRUNM} ${DATOOL} hafsvi_postproc \
       --in_file=${DATA}/anl_storm/storm_anl \
       --debug_level=1 --interpolation_points=5 \
       --relaxzone=30 \
diff --git a/ush/hafs_runcmd.sh.inc b/ush/hafs_runcmd.sh.inc
index 4f5da4b7b..c50260b9b 100644
--- a/ush/hafs_runcmd.sh.inc
+++ b/ush/hafs_runcmd.sh.inc
@@ -27,6 +27,7 @@ if [ "$machine" = wcoss2 ]; then
   export APRUNS="time"
   export APRUNO="mpiexec -n 1 --cpu-bind core --depth ${OMP_NUM_THREADS}"
   export APRUNC="mpiexec -n ${TOTAL_TASKS} --cpu-bind core --depth ${OMP_NUM_THREADS}"
+  export APRUNM="mpiexec -n ${TOTAL_TASKS}"
   export APRUNF="mpiexec -n ${TOTAL_TASKS} cfp "
   export APRUNCFP="mpiexec"
   export BACKGROUND=""
@@ -35,6 +36,7 @@ elif [ "$machine" = jet ] || [ "$machine" = hera ] || [ "$machine" = orion ]; th
   export APRUNS="srun --mem=0 --ntasks=1 --nodes=1 --ntasks-per-node=1 --cpus-per-task=1"
   export APRUNO="srun --mem=0 --exclusive --ntasks=1 --nodes=1 --ntasks-per-node=${NCTSK} --cpus-per-task=${PURE_OMP_THREADS}"
   export APRUNC="srun --mem=0 --ntasks=${TOTAL_TASKS} --ntasks-per-node=${NCTSK} --cpus-per-task=${OMP_NUM_THREADS}"
+  export APRUNM="srun --mem=0 --ntasks=${TOTAL_TASKS} --ntasks-per-node=${NCTSK} --cpus-per-task=${OMP_NUM_THREADS}"
  #export APRUNF="srun --mem=0 --ntasks=${TOTAL_TASKS} --ntasks-per-node=${NCTSK} --cpus-per-task=${OMP_NUM_THREADS} --multi-prog"
   export APRUNF="time"
   export APRUNCFP="time"
@@ -45,6 +47,7 @@ else
   export APRUNS="time"
   export APRUNO="time"
   export APRUNC="mpirun"
+  export APRUNM="mpirun"
   export APRUNF="${MPISERIAL:-mpiserial}"
   export APRUNCFP="time"
   export BACKGROUND=""