diff --git a/ush/fill_jinja_template.py b/ush/fill_jinja_template.py
index ef3b57245..55cf0a704 100755
--- a/ush/fill_jinja_template.py
+++ b/ush/fill_jinja_template.py
@@ -259,7 +259,7 @@ def main(cla):
     tvars = {}
     for var in template_vars:
 
-        if cfg.get(var) is None:
+        if cfg.get(var, "NULL") == "NULL":
             raise KeyError(f'{var} does not exist in user-supplied settings!')
 
         if not cla.quiet:
diff --git a/ush/launch_FV3LAM_wflow.sh b/ush/launch_FV3LAM_wflow.sh
index 60910d812..14cb1ad19 100755
--- a/ush/launch_FV3LAM_wflow.sh
+++ b/ush/launch_FV3LAM_wflow.sh
@@ -91,13 +91,14 @@ expt_name="${EXPT_SUBDIR}"
 #
 #-----------------------------------------------------------------------
 #
-if [ "$MACHINE" != "CHEYENNE" ]; then
-  if [ "$MACHINE" = "ORION" ]; then
-    module load contrib rocoto
-  else
-    module purge
-    module load rocoto
-  fi
+if [ "$MACHINE" = "CHEYENNE" ]; then
+  module use -a /glade/p/ral/jntp/UFS_SRW_app/modules/
+  module load rocoto
+elif [ "$MACHINE" = "ORION" ]; then
+  module load contrib rocoto
+else
+  module purge
+  module load rocoto
 fi
 #
 #-----------------------------------------------------------------------
diff --git a/ush/templates/FV3LAM_wflow.xml b/ush/templates/FV3LAM_wflow.xml
index f95c0ecd2..2dab388cb 100644
--- a/ush/templates/FV3LAM_wflow.xml
+++ b/ush/templates/FV3LAM_wflow.xml
@@ -64,17 +64,17 @@ the "HPSS" type is used for the GET_EXTRN_ICS_TN and GET_EXTRN_LBCS_TN
 tasks; and the "FCST" type is used for the RUN_FCST_TN task.
 -->
 
-{%- if (partition_default != "")  %}
+{%- if partition_default is not none %}
 <!ENTITY RSRV_DEFAULT "<account>&ACCOUNT;</account><queue>&QUEUE_DEFAULT;</queue><partition>{{ partition_default }}</partition>">
 {%- else %}
 <!ENTITY RSRV_DEFAULT "<account>&ACCOUNT;</account><queue>&QUEUE_DEFAULT;</queue>">
 {%- endif %}
-{%- if (partition_hpss != "")  %}
+{%- if partition_hpss is not none %}
 <!ENTITY RSRV_HPSS    "<account>&ACCOUNT;</account><queue>&QUEUE_HPSS;</queue><partition>{{ partition_hpss }}</partition>">
 {%- else %}
 <!ENTITY RSRV_HPSS    "<account>&ACCOUNT;</account><queue>&QUEUE_HPSS;</queue>">
 {%- endif %}
-{%- if (partition_fcst != "")  %}
+{%- if partition_fcst is not none %}
 <!ENTITY RSRV_FCST    "<account>&ACCOUNT;</account><queue>&QUEUE_FCST;</queue><partition>{{ partition_fcst }}</partition>">
 {%- else %}
 <!ENTITY RSRV_FCST    "<account>&ACCOUNT;</account><queue>&QUEUE_FCST;</queue>">