diff --git a/cime_config/stream_definition_v2.0.xsd b/cime_config/stream_definition_v2.0.xsd
index de3189e3..d6ec7476 100644
--- a/cime_config/stream_definition_v2.0.xsd
+++ b/cime_config/stream_definition_v2.0.xsd
@@ -93,7 +93,8 @@
       <xs:simpleContent>
         <xs:extension base="xs:string">
           <xs:attribute name="model_grid" type="xs:string" />
-          <xs:attribute name="compset" type="xs:string" />
+	  <xs:attribute name="compset" type="xs:string" />
+	  <xs:attribute name="CLM_USRDAT_NAME" type="xs:string" />
         </xs:extension>
       </xs:simpleContent>
     </xs:complexType>
diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml
index 70a9e79f..e6cfc015 100644
--- a/datm/cime_config/config_component.xml
+++ b/datm/cime_config/config_component.xml
@@ -299,10 +299,10 @@
   <entry id="DATM_YR_START_FILENAME">
     <type>integer</type>
     <valid_values></valid_values>
-    <default_value>UNSET</default_value>
+    <default_value>9999</default_value>
     <group>run_component_datm</group>
     <file>env_run.xml</file>
-    <desc>Start year listed in PLUMBER2 filenames. Leave unset for other cases.</desc>
+    <desc>Start year listed in PLUMBER2 filenames. Leave as 9999 for other cases.</desc>
   </entry>
 
   <entry id="DATM_YR_END">
diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml
index 6ab079ed..bfe6fc4a 100644
--- a/datm/cime_config/stream_definition_datm.xml
+++ b/datm/cime_config/stream_definition_datm.xml
@@ -4082,7 +4082,7 @@
     </stream_taxmode>
     <stream_dtlimit>
       <dtlimit>1.5</dtlimit>
-      <dtlimit $CLM_USRDAT_NAME=="PLUMBER2">30</dtlimit>
+      <dtlimit CLM_USRDAT_NAME="PLUMBER2">30</dtlimit>
     </stream_dtlimit>
     <stream_readmode>single</stream_readmode>
   </stream_entry>
@@ -4622,7 +4622,7 @@
     </stream_taxmode>
     <stream_dtlimit>
       <dtlimit>1.5</dtlimit>
-      <dtlimit $CLM_USRDAT_NAME=="PLUMBER2">30</dtlimit>
+      <dtlimit CLM_USRDAT_NAME="PLUMBER2">30</dtlimit>
     </stream_dtlimit>
     <stream_readmode>single</stream_readmode>
   </stream_entry>