diff --git a/src/conf/module-setup.csh.inc b/src/conf/module-setup.csh.inc
index 92776744..d3145e83 100644
--- a/src/conf/module-setup.csh.inc
+++ b/src/conf/module-setup.csh.inc
@@ -8,7 +8,13 @@ if ( { test -d /lfs3 } ) then
             source /apps/lmod/lmod/init/$__ms_shell
     endif
     module purge
-else if ( { test -d /scratch3 } ) then
+else if ( { test -d /scratch1 -a ! -d /scratch } ) then
+    # We are on NOAA Hera
+    if ( ! { module help >& /dev/null } ) then
+        source /apps/lmod/lmod/init/$__ms_shell
+    endif
+    module purge
+else if ( { test -d /scratch3 -a -d /scratch } ) then
     # We are on NOAA Theia
     if ( ! { module help >& /dev/null } ) then
         source /apps/lmod/lmod/init/$__ms_shell
diff --git a/src/conf/module-setup.sh.inc b/src/conf/module-setup.sh.inc
index 7dffac0a..cf5f853c 100644
--- a/src/conf/module-setup.sh.inc
+++ b/src/conf/module-setup.sh.inc
@@ -22,7 +22,13 @@ if [[ -d /lfs3 ]] ; then
         source /apps/lmod/lmod/init/$__ms_shell
     fi
     module purge
-elif [[ -d /scratch3 ]] ; then
+elif [[ -d /scratch1 && ! -d /scratch ]] ; then
+    # We are on NOAA Hera
+    if ( ! eval module help > /dev/null 2>&1 ) ; then
+        source /apps/lmod/lmod/init/$__ms_shell
+    fi
+    module purge
+elif [[ -d /scratch3 && -d /scratch ]] ; then
     # We are on NOAA Theia
     if ( ! eval module help > /dev/null 2>&1 ) ; then
         source /apps/lmod/lmod/init/$__ms_shell
diff --git a/src/module_MEDIATOR.F90 b/src/module_MEDIATOR.F90
index b2e2d34c..6a3d44fd 100644
--- a/src/module_MEDIATOR.F90
+++ b/src/module_MEDIATOR.F90
@@ -922,7 +922,7 @@ subroutine InitializeP0(gcomp, importState, exportState, clock, rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
       line=__LINE__, file=__FILE__)) return  ! bail out
     dbug_flag = ESMF_UtilString2Int(value, &
-      specialStringList=(/"off","low","high","max"/), &
+      specialStringList=(/character(4)::"off","low","high","max"/), &
       specialValueList=(/0,1,100,255/), rc=rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
       line=__LINE__, file=__FILE__)) return  ! bail out