diff --git a/cime_config/acme/machines/config_batch.xml b/cime_config/acme/machines/config_batch.xml
index 71a4e05df786..3d3a0f511b99 100644
--- a/cime_config/acme/machines/config_batch.xml
+++ b/cime_config/acme/machines/config_batch.xml
@@ -79,7 +79,7 @@
     <batch_query args="-u $USER" >qselect</batch_query>
     <batch_submit>qsub </batch_submit>
     <batch_directive>#PBS</batch_directive>
-    <jobid_pattern>^(\d+)\.</jobid_pattern>
+    <jobid_pattern>^(\d+)</jobid_pattern>
     <depend_string> -W depend=afterok:jobid</depend_string>
     <walltime_format>%H:%M:%S</walltime_format>
     <submit_args>
@@ -164,10 +164,8 @@
 
     <!-- eos is PBS -->
     <batch_system MACH="eos" type="pbs" version="x.y">
-    <jobid_pattern>^(\d+)</jobid_pattern>
     <directives>
       <directive>-A {{ project }}</directive>
-      <directive>-l mppwidth={{ mppwidth }}</directive>
       <directive>-l  nodes={{ num_nodes }}</directive>
     </directives>
     <queues>
diff --git a/cime_config/acme/machines/config_machines.xml b/cime_config/acme/machines/config_machines.xml
index 51f9262a9aff..4c58bbda7b36 100644
--- a/cime_config/acme/machines/config_machines.xml
+++ b/cime_config/acme/machines/config_machines.xml
@@ -1038,7 +1038,8 @@
              <arg name="num_tasks" > -n {{ num_tasks }}</arg>
              <arg name="tasks_per_node" > -N {{ tasks_per_node }}</arg>
              <arg name="thread_count" > -d {{ thread_count }}</arg>
-             <arg name="numa_node" > -cc {{ numa_node }}</arg>
+	     <arg name="debugging"> -D 7</arg>
+             <arg name="numa_node" > -cc numa_node</arg>
            </arguments>
          </mpirun>
          <mpirun mpilib="mpi-serial">
@@ -1080,8 +1081,6 @@
 	     <command name="load">cray-netcdf/4.3.2</command>
 	   </modules>
 	   <modules milib="!mpi-serial">
-	     <!-- <command name="load">cray-netcdf-hdf5parallel/4.3.3.1</command>
-	     <command name="load">cray-parallel-netcdf/1.6.1</command> -->
 	     <command name="load">cray-netcdf-hdf5parallel</command>
 	     <command name="load">cray-parallel-netcdf</command>
 	   </modules>