diff --git a/jobs/JGLOBAL_WAVE_GEMPAK b/jobs/JGLOBAL_WAVE_GEMPAK
index 1795718044..1bccb152d7 100755
--- a/jobs/JGLOBAL_WAVE_GEMPAK
+++ b/jobs/JGLOBAL_WAVE_GEMPAK
@@ -5,6 +5,7 @@ date
 set -xa
 export PS4='$SECONDS + ' 
 
+# JY - 10/29, move the block in the front, otherwise PDY is not defined for COMIN
 export DATA=${DATA:-${DATAROOT}/${jobid:?}}
 mkdir -p $DATA
 cd $DATA
@@ -36,7 +37,7 @@ export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONE
 #export pid=$$
 export pgmout="OUTPUT.$$"
 
-export DBN_ALERT_TYPE=NFC_WAVEENS_GEMPAK
+export DBN_ALERT_TYPE=GFS_WAVE_GEMPAK
 export SENDCOM=${SENDCOM:-YES}
 export SENDDBN=${SENDDBN:-YES}
 export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
diff --git a/scripts/exgfs_wave_post_gridded_sbs.sh b/scripts/exgfs_wave_post_gridded_sbs.sh
index 8b438777a5..4487028b1e 100755
--- a/scripts/exgfs_wave_post_gridded_sbs.sh
+++ b/scripts/exgfs_wave_post_gridded_sbs.sh
@@ -285,7 +285,7 @@
       iwait=0
       for wavGRD in ${waveGRD} ; do
         gfile=$COMIN/rundata/${WAV_MOD_TAG}.out_grd.${wavGRD}.${YMD}.${HMS}
-        while [ ! -s ${gfile} ]; do sleep 10; iwait=iwait+1; done
+        while [ ! -s ${gfile} ]; do sleep 10; let iwait=iwait+1; done
         if [ $iwait -eq $iwaitmax ]; then 
           echo '*************************************************** '
           echo " FATAL ERROR : NO RAW FIELD OUTPUT FILE out_grd.$grdID "
diff --git a/ush/wave_grib2_sbs.sh b/ush/wave_grib2_sbs.sh
index 701a314df2..7a3ee6f5d2 100755
--- a/ush/wave_grib2_sbs.sh
+++ b/ush/wave_grib2_sbs.sh
@@ -38,6 +38,8 @@
   cd $GRIBDATA
 #  postmsg "$jlogfile" "Making GRIB2 Files."   # commented to reduce unnecessary output to jlogfile
 
+  alertName=`echo $RUN|tr [a-z] [A-Z]`
+
   grdID=$1 
   gribDIR=${grdID}_grib 
   rm -rfd ${gribDIR}
@@ -238,8 +240,9 @@
       echo "   Alerting GRIB file as $COMOUT/gridded/${outfile}"
       echo "   Alerting GRIB index file as $COMOUT/gridded/${outfile}.idx"
       [[ "$LOUD" = YES ]] && set -x
-      $DBNROOT/bin/dbn_alert MODEL WAVE_GRIB_GB2 $job $COMOUT/gridded/${outfile}
-      $DBNROOT/bin/dbn_alert MODEL WAVE_GRIB_GB2_WIDX $job $COMOUT/gridded/${outfile}.idx
+      # $DBNROOT/bin/dbn_alert MODEL WAVE_GRIB_GB2 $job $COMOUT/gridded/${outfile}
+      $DBNROOT/bin/dbn_alert MODEL ${alertName}_WAVE_GB2 $job $COMOUT/gridded/${outfile}
+      $DBNROOT/bin/dbn_alert MODEL ${alertName}_WAVE_GB2_WIDX $job $COMOUT/gridded/${outfile}.idx
     fi
 
  
diff --git a/ush/wave_tar.sh b/ush/wave_tar.sh
index dc74e72bec..560493f912 100755
--- a/ush/wave_tar.sh
+++ b/ush/wave_tar.sh
@@ -36,6 +36,7 @@
   cd $DATA
   postmsg "$jlogfile" "Making TAR FILE"
 
+  alertName=`echo $RUN|tr [a-z] [A-Z]`
 
   set +x
   echo ' '
@@ -205,14 +206,14 @@
     exit 4
   fi
 
-  if [ "$SENDDBN" = 'YES' ]
+  if [ "$SENDDBN" = 'YES' -a  $type != "ibp" ]
   then
     set +x
     echo ' '
     echo "   Alerting TAR file as $COMOUT/station/${file_name}"
     echo ' '
     [[ "$LOUD" = YES ]] && set -x
-    $DBNROOT/bin/dbn_alert MODEL OMBWAVE $job $COMOUT/station/${file_name}
+    $DBNROOT/bin/dbn_alert MODEL ${alertName}_WAVE_TAR $job $COMOUT/station/${file_name}
   fi
 
 # --------------------------------------------------------------------------- #