diff --git a/Source/Diffterm.H b/Source/Diffterm.H
index 4e4ebe74c..859f3c378 100644
--- a/Source/Diffterm.H
+++ b/Source/Diffterm.H
@@ -271,8 +271,8 @@ pc_diffusion_flux_eb(
                             coef[dComp_xi] * divu;
                    , tauz = coef[dComp_mu] * (dwdy + dvdz);)
     } else if (dir == 2) {
+#if AMREX_SPACEDIM == 3
       const amrex::Real dudz = dxinv[dir] * (q(iv, QU) - q(ivm, QU));
-
       const amrex::Real dvdz = dxinv[dir] * (q(iv, QV) - q(ivm, QV));
       const amrex::Real dwdz = dxinv[dir] * (q(iv, QW) - q(ivm, QW));
 
@@ -313,6 +313,7 @@ pc_diffusion_flux_eb(
       tauy = coef[dComp_mu] * (dvdz + dwdy);
       tauz = coef[dComp_mu] * (2.0 * dwdz - 2.0 / 3.0 * divu) +
              coef[dComp_xi] * divu;
+#endif
     }
   }
   const amrex::Real dTdd =
@@ -413,6 +414,7 @@ pc_diffusion_flux(
       coef[dComp_mu] * (2.0 * dvdy - 2.0 / 3.0 * divu) + coef[dComp_xi] * divu;
     AMREX_D_TERM(, , tauz = coef[dComp_mu] * (dwdy + dvdz););
   } else if (dir == 2) {
+#if AMREX_SPACEDIM == 3
     const amrex::Real dudz = dxinv[dir] * (q(iv, QU) - q(ivm, QU));
     const amrex::Real dvdz = dxinv[dir] * (q(iv, QV) - q(ivm, QV));
     const amrex::Real dwdz = dxinv[dir] * (q(iv, QW) - q(ivm, QW));
@@ -434,6 +436,7 @@ pc_diffusion_flux(
     tauy = coef[dComp_mu] * (dvdz + dwdy);
     tauz =
       coef[dComp_mu] * (2.0 * dwdz - 2.0 / 3.0 * divu) + coef[dComp_xi] * divu;
+#endif
   }
   const amrex::Real dTdd = dxinv[dir] * (q(iv, QTEMP) - q(ivm, QTEMP));
 
diff --git a/Source/Geometry.cpp b/Source/Geometry.cpp
index 3fd6efcde..f328311ab 100644
--- a/Source/Geometry.cpp
+++ b/Source/Geometry.cpp
@@ -159,23 +159,26 @@ ExtrudedTriangles::build(
   problo = geom.ProbLo();
   probhi = geom.ProbHi();
 
-  maxlen = amrex::max<amrex::Real>(
-    amrex::max<amrex::Real>(geom.ProbLength(0), geom.ProbLength(1)),
-    geom.ProbLength(2));
+  AMREX_D_TERM(maxlen = geom.ProbLength(0);
+               , maxlen = amrex::max<amrex::Real>(maxlen, geom.ProbLength(1));
+               , maxlen = amrex::max<amrex::Real>(maxlen, geom.ProbLength(2)););
 
   // setting all triangles to be waaay outside the domain initially
   for (int itri = 0; itri < max_tri; itri++) {
-    alltri[npts_in_tri * itri + 0][0] = problo[0] + 100.0 * maxlen;
-    alltri[npts_in_tri * itri + 0][1] = problo[1] - 100.0 * maxlen;
-    alltri[npts_in_tri * itri + 0][2] = 0.0;
-
-    alltri[npts_in_tri * itri + 1][0] = probhi[0] + 100.0 * maxlen;
-    alltri[npts_in_tri * itri + 1][1] = problo[1] - 100.0 * maxlen;
-    alltri[npts_in_tri * itri + 1][2] = 0.0;
-
-    alltri[npts_in_tri * itri + 2][0] = probhi[0] + 100.0 * maxlen;
-    alltri[npts_in_tri * itri + 2][1] = problo[1] + 100.0 * maxlen;
-    alltri[npts_in_tri * itri + 2][2] = 0.0;
+    AMREX_D_TERM(alltri[npts_in_tri * itri + 0][0] = problo[0] + 100.0 * maxlen;
+                 ,
+                 alltri[npts_in_tri * itri + 0][1] = problo[1] - 100.0 * maxlen;
+                 , alltri[npts_in_tri * itri + 0][2] = 0.0;);
+
+    AMREX_D_TERM(alltri[npts_in_tri * itri + 1][0] = probhi[0] + 100.0 * maxlen;
+                 ,
+                 alltri[npts_in_tri * itri + 1][1] = problo[1] - 100.0 * maxlen;
+                 , alltri[npts_in_tri * itri + 1][2] = 0.0;);
+
+    AMREX_D_TERM(alltri[npts_in_tri * itri + 2][0] = probhi[0] + 100.0 * maxlen;
+                 ,
+                 alltri[npts_in_tri * itri + 2][1] = problo[1] + 100.0 * maxlen;
+                 , alltri[npts_in_tri * itri + 2][2] = 0.0;);
   }
 
   // get user defined number of triangles
@@ -217,17 +220,14 @@ ExtrudedTriangles::build(
     point1 = alltri[npts_in_tri * itri + 1];
     point2 = alltri[npts_in_tri * itri + 2];
 
-    norm0[0] = -(point1[1] - point0[1]);
-    norm0[1] = (point1[0] - point0[0]);
-    norm0[2] = 0.0;
+    AMREX_D_TERM(norm0[0] = -(point1[1] - point0[1]);
+                 , norm0[1] = (point1[0] - point0[0]);, norm0[2] = 0.0;);
 
-    norm1[0] = -(point2[1] - point1[1]);
-    norm1[1] = (point2[0] - point1[0]);
-    norm1[2] = 0.0;
+    AMREX_D_TERM(norm1[0] = -(point2[1] - point1[1]);
+                 , norm1[1] = (point2[0] - point1[0]);, norm1[2] = 0.0;);
 
-    norm2[0] = -(point0[1] - point2[1]);
-    norm2[1] = (point0[0] - point2[0]);
-    norm2[2] = 0.0;
+    AMREX_D_TERM(norm2[0] = -(point0[1] - point2[1]);
+                 , norm2[1] = (point0[0] - point2[0]);, norm2[2] = 0.0;);
 
     // normalize so that magnitude is 1
     amrex::Real norm = sqrt(norm0[0] * norm0[0] + norm0[1] * norm0[1]);
diff --git a/Submodules/PelePhysics b/Submodules/PelePhysics
index 37efd1952..45ae8ba14 160000
--- a/Submodules/PelePhysics
+++ b/Submodules/PelePhysics
@@ -1 +1 @@
-Subproject commit 37efd195298f438caae4aef19d0b99f6f683f878
+Subproject commit 45ae8ba14f2a14e8f692c83a3b675883f7018bfd
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index a57b2888e..220b582f1 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -255,7 +255,7 @@ add_test_r(eb-c10 EB-C10)
 add_test_rv(eb-c11 EB-C11)
 add_test_rv(eb-c12 EB-C12)
 if(PELE_DIM EQUAL 2)
-    add_test_r(eb-flowpastcylinder-re500 EB-FlowPastCylinder)  
+    add_test_r(eb-flowpastcylinder-re500 EB-FlowPastCylinder)
 endif()
 if(PELE_DIM EQUAL 2)
   add_test_r(auxquantities_eb AuxQuantities)
@@ -304,13 +304,13 @@ add_test_re(zerod-1 zeroD)
 add_test_re(spray-eb Spray-EB)
 add_test_re(spray-a-wbreakup Spray-A-Wbreakup)
 add_test_re(soot-flame Soot-Flame)
+add_test_re(eb-c7 EB-C7)
+add_test_re(eb-bluffbody-1 EB-BluffBody)
 if(PELE_DIM GREATER 2)
   add_test_re(eb-c8 EB-C8)
   add_test_re(eb-c8-rere-mol EB-C8)
   add_test_re(tg-3 TG)
   add_test_re(tg-4 TG)
-  add_test_re(eb-c7 EB-C7)
-  add_test_re(eb-bluffbody-1 EB-BluffBody)
 endif()
 
 #=============================================================================