diff --git a/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.fcst b/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.fcst
index 44f137eace..44826db5d1 100644
--- a/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.fcst
+++ b/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/config.fcst
@@ -149,7 +149,7 @@ export isatmedmf=1
 if [[ "$CCPP_SUITE" == "FV3_GFS_v17_p8_ugwpv1_mynn" || "$CCPP_SUITE" == "FV3_GFS_v17_p8_ugwpv1_c3_mynn" || "$CCPP_SUITE" == "FV3_GFS_v17_p8_mynn" || "$CCPP_SUITE" == "FV3_GFS_v17_p8_c3_mynn" ]] ; then
    export satmedmf=".false."
    export isatmedmf=0
-   export CPP
+   export shal_cnv=".false."
    export do_mynnedmf=".true."
    export do_mynnsfclay=".false."
    export icloud_bl=1
diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd
index 945128c1b3..3b4f88528b 160000
--- a/sorc/ufs_model.fd
+++ b/sorc/ufs_model.fd
@@ -1 +1 @@
-Subproject commit 945128c1b35d1d31ea0572721be87d013d53123b
+Subproject commit 3b4f88528ba1a8c00265eae2a2339f4b82e26dc2
diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd
index f689bd2b50..78ff429bc2 160000
--- a/sorc/ufs_utils.fd
+++ b/sorc/ufs_utils.fd
@@ -1 +1 @@
-Subproject commit f689bd2b5049cf18f2367c3fa65473fad0f797b1
+Subproject commit 78ff429bc2dec45ff7dd9ac0d53cc75f12a739a8