diff --git a/parm/config/config.wave b/parm/config/config.wave
index 95c0511de3..903bb765a1 100755
--- a/parm/config/config.wave
+++ b/parm/config/config.wave
@@ -38,7 +38,7 @@ export WAVEWND_FID=
 
 # Grids for output fields (used in all steps)
 export waveuoutpGRD=points
-export waveinterpGRD='glo_15mxt at_10m ep_10m wc_10m ak_10m glo_30m' # Grids that need to be interpolated from native
+export waveinterpGRD='glo_15mxt at_10m ep_10m wc_10m glo_30m' # Grids that need to be interpolated from native
                              # in POST will generate grib unless gribOK not set
 export wavesbsGRD=''  # side-by-side grids generated as wave model runs, writes to com
 export wavepostGRD='gnh_10m aoc_9km gsh_15m' # Native grids that will be post-processed (grib2)
diff --git a/scripts/exgfs_wave_nawips.sh b/scripts/exgfs_wave_nawips.sh
index 45a7e1873a..4c15c76799 100755
--- a/scripts/exgfs_wave_nawips.sh
+++ b/scripts/exgfs_wave_nawips.sh
@@ -25,6 +25,9 @@ export cycle=${cycle:-t${cyc}z}
 export GEMwave=${GEMwave:-$HOMEgfs/gempak}
 export FIXwave=${FIXwave:-HOMEgfs/fix}
 export DATA=${DATA:-${DATAROOT:?}/${jobid}}
+
+export errchk=${errchk:-err_chk}
+
 if [ ! -d $DATA ];then
   mkdir -p $DATA
 fi
diff --git a/scripts/exgfs_wave_prdgen_bulls.sh b/scripts/exgfs_wave_prdgen_bulls.sh
index 4eb511309e..3eab197037 100755
--- a/scripts/exgfs_wave_prdgen_bulls.sh
+++ b/scripts/exgfs_wave_prdgen_bulls.sh
@@ -36,6 +36,8 @@
  export USHwave=${USHwave:-$HOMEgfs/ush}
  #export EXECcode=${EXECcode:-CODEwave/exec}
 
+ export errchk=${errchk:-err_chk}
+
  mkdir -p $DATA
  cd $DATA
  export wavelog=${DATA}/${RUNwave}_prdgbulls.log
diff --git a/scripts/exgfs_wave_prdgen_gridded.sh b/scripts/exgfs_wave_prdgen_gridded.sh
index 3243dacb3e..0b5ee693a7 100755
--- a/scripts/exgfs_wave_prdgen_gridded.sh
+++ b/scripts/exgfs_wave_prdgen_gridded.sh
@@ -41,6 +41,8 @@
  mkdir -p $DATA
  cd $DATA
  export wavelog=${DATA}/${COMPONENTwave}_prdggridded.log
+
+ export errchk=${errchk:-err_chk}
  
  postmsg "$jlogfile" "HAS BEGUN on `hostname`"
  msg="Starting MWW3 GRIDDED PRODUCTS SCRIPT"
diff --git a/sorc/checkout.sh b/sorc/checkout.sh
index e12d72fd4e..a522254308 100755
--- a/sorc/checkout.sh
+++ b/sorc/checkout.sh
@@ -26,7 +26,7 @@ if [[ ! -d fv3gfs.fd ]] ; then
     rm -f ${topdir}/checkout-fv3gfs.log
     git clone https://github.com/ufs-community/ufs-weather-model fv3gfs.fd >> ${topdir}/checkout-fv3gfs.log 2>&1
     cd fv3gfs.fd
-    git checkout GFS.v16.0.14
+    git checkout GFS.v16.0.15
     git submodule update --init --recursive
     cd ${topdir}
 else
@@ -95,7 +95,7 @@ if [[ ! -d gfs_wafs.fd ]] ; then
     rm -f ${topdir}/checkout-gfs_wafs.log
     git clone --recursive https://github.com/NOAA-EMC/EMC_gfs_wafs.git gfs_wafs.fd >> ${topdir}/checkout-gfs_wafs.log 2>&1
     cd gfs_wafs.fd
-    git checkout gfs_wafs.v6.0.17
+    git checkout gfs_wafs.v6.0.18
     cd ${topdir}
 else
     echo 'Skip.  Directory gfs_wafs.fd already exists.'