diff --git a/CIME/XML/env_mach_pes.py b/CIME/XML/env_mach_pes.py
index 083f283f81e..1da8fff6f0c 100644
--- a/CIME/XML/env_mach_pes.py
+++ b/CIME/XML/env_mach_pes.py
@@ -66,7 +66,7 @@ def get_value(
                 ngpus_per_node = self.get_value("NGPUS_PER_NODE")
             if (ngpus_per_node and value) and value < 0:
                 value = -1 * value * max_cputasks_per_gpu_node
-            elif value:
+            elif value and value < 0:
                 value = -1 * value * max_mpitasks_per_node
         # in the nuopc driver there is only one NINST value
         # so that NINST_{comp} = NINST
diff --git a/CIME/case/case.py b/CIME/case/case.py
index 3ec83b2c10d..567eb223988 100644
--- a/CIME/case/case.py
+++ b/CIME/case/case.py
@@ -1152,7 +1152,6 @@ def _setup_mach_pes(self, pecount, multi_driver, ninst, machine_name, mpilib):
         comment = None
         force_tasks = None
         force_thrds = None
-
         if match1:
             opti_tasks = match1.group(1)
             if opti_tasks.isdigit():
@@ -1222,7 +1221,6 @@ def _setup_mach_pes(self, pecount, multi_driver, ninst, machine_name, mpilib):
             pstrid = pes_pstrid[pstrid_str] if pstrid_str in pes_pstrid else 1
 
             totaltasks.append((ntasks + rootpe) * nthrds)
-
             mach_pes_obj.set_value(ntasks_str, ntasks)
             mach_pes_obj.set_value(nthrds_str, nthrds)
             mach_pes_obj.set_value(rootpe_str, rootpe)
@@ -1399,7 +1397,6 @@ def configure(
             if not dmax:
                 dmax = machobj.get_value(name)
             if dmax:
-                print(f"here name is {name} and dmax is {dmax}")
                 self.set_value(name, dmax)
             elif name == "MAX_CPUTASKS_PER_GPU_NODE":
                 logger.debug(