diff --git a/src/conf/module-setup.sh.inc b/src/conf/module-setup.sh.inc
index b427faa9..7bd64f4c 100644
--- a/src/conf/module-setup.sh.inc
+++ b/src/conf/module-setup.sh.inc
@@ -58,7 +58,7 @@ elif [[ -L /usrx && "$( readlink /usrx 2> /dev/null )" =~ dell ]] ; then
     fi
     module purge
 elif [[ -d /glade ]] ; then
-    # We are on NCAR Cheyenne   
+    # We are on NCAR Cheyenne
     if ( ! eval module help > /dev/null 2>&1 ) ; then
       . /glade/u/apps/ch/modulefiles/default/localinit/localinit.sh
     fi
diff --git a/src/incmake/env/rdhpcs/hera.gnu.mk b/src/incmake/env/rdhpcs/hera.gnu.mk
new file mode 100644
index 00000000..41eedf90
--- /dev/null
+++ b/src/incmake/env/rdhpcs/hera.gnu.mk
@@ -0,0 +1,7 @@
+MACHINE_ID=hera
+FULL_MACHINE_ID=hera
+USE_MODULES=YES
+DEFAULT_MODULE=$(FULL_MACHINE_ID)/ESMF_NUOPC
+BUILD_TARGET=$(FULL_MACHINE_ID).$(NEMS_COMPILER)
+NEMS_COMPILER=gnu
+MODULE_LOGIC=$(call ULIMIT_MODULE_LOGIC,200000)
diff --git a/src/module_NEMS_Rusage.F90 b/src/module_NEMS_Rusage.F90
index 34c62c47..747746bf 100644
--- a/src/module_NEMS_Rusage.F90
+++ b/src/module_NEMS_Rusage.F90
@@ -678,7 +678,7 @@ subroutine color_by_hash(name,namelen,commin,comm_name,comm_hosts,rank_world,ier
        c_name1(1) = ctry(itry:itry)
        c_length=namelen+1
        c_error=-999
-       c_crc32c=nems_c_crc32(c_name1,c_length,c_error)
+       c_crc32c=abs(nems_c_crc32(c_name1,c_length,c_error))
        if(c_error/=0) then
           ! Should never get here.  This indicates the name is
           ! empty or beyond 2**31-3 bytes.