diff --git a/scripts/lib/CIME/XML/env_batch.py b/scripts/lib/CIME/XML/env_batch.py
index cf25e5dc02bf..3cd540c479c8 100644
--- a/scripts/lib/CIME/XML/env_batch.py
+++ b/scripts/lib/CIME/XML/env_batch.py
@@ -503,11 +503,11 @@ def submit_jobs(self, case, no_batch=False, job=None, user_prereq=None, skip_pnl
 
                 if self._batchtype == "cobalt" or external_workflow:
                     break
-            if not external_workflow:
+
+            if not external_workflow and not no_batch:
                 expect(batch_job_id, "No result from jobs {}".format(jobs))
                 prev_job = batch_job_id
 
-
         if dry_run:
             return jobcmds
         else:
diff --git a/scripts/lib/CIME/XML/env_workflow.py b/scripts/lib/CIME/XML/env_workflow.py
index 3820dfb22390..5a70e4d5987f 100644
--- a/scripts/lib/CIME/XML/env_workflow.py
+++ b/scripts/lib/CIME/XML/env_workflow.py
@@ -83,7 +83,7 @@ def get_job_specs(self, job):
         tasks_per_node = self.get_value("tasks_per_node", subgroup=job)
         thread_count = self.get_value("thread_count", subgroup=job)
         num_nodes = None
-        if task_count is not None:
+        if task_count is not None and tasks_per_node is not None:
             task_count = int(task_count)
             num_nodes   = int(math.ceil(float(task_count)/float(tasks_per_node)))
             tasks_per_node =  task_count//num_nodes
diff --git a/scripts/lib/CIME/case/case_submit.py b/scripts/lib/CIME/case/case_submit.py
index dba1d6895115..7559f8869e7f 100644
--- a/scripts/lib/CIME/case/case_submit.py
+++ b/scripts/lib/CIME/case/case_submit.py
@@ -216,7 +216,6 @@ def check_case(self):
         # the ww3 buildnml has dependancies on inputdata so we must run it again
         self.create_namelists(component='WAV')
 
-
     expect(self.get_value("BUILD_COMPLETE"), "Build complete is "
            "not True please rebuild the model by calling case.build")
     logger.info("Check case OK")