diff --git a/Src/AmrCore/AMReX_InterpFaceReg_3D_C.H b/Src/AmrCore/AMReX_InterpFaceReg_3D_C.H
index 2d1728cb929..921395be47f 100644
--- a/Src/AmrCore/AMReX_InterpFaceReg_3D_C.H
+++ b/Src/AmrCore/AMReX_InterpFaceReg_3D_C.H
@@ -15,7 +15,6 @@ void interp_face_reg (int i, int j, int k, IntVect const& rr, Array4<Real> const
         for (int n = 0; n < ncomp; ++n) {
             fine(i,j,k,n+scomp) = crse(ic,jc,kc,n);
         }
-#if 0
         if (jc != per_grown_domain.smallEnd(1) && jc != per_grown_domain.bigEnd(1) && rr[1] > 1) {
             Real sfy = Real(1.0);
             for (int n = 0; n < ncomp; ++n) {
@@ -54,12 +53,10 @@ void interp_face_reg (int i, int j, int k, IntVect const& rr, Array4<Real> const
                 fine(i,j,k,n+scomp) += zoff * slope(i,j,k,n) * sfz;
             }
         }
-#endif
     } else if (idim == 1) {
         for (int n = 0; n < ncomp; ++n) {
             fine(i,j,k,n+scomp) = crse(ic,jc,kc,n);
         }
-#if 0
         if (ic != per_grown_domain.smallEnd(0) && ic != per_grown_domain.bigEnd(0) && rr[0] > 1) {
             Real sfx = Real(1.0);
             for (int n = 0; n < ncomp; ++n) {
@@ -99,12 +96,10 @@ void interp_face_reg (int i, int j, int k, IntVect const& rr, Array4<Real> const
                 fine(i,j,k,n+scomp) += zoff * slope(i,j,k,n) * sfz;
             }
         }
-#endif
     } else {
         for (int n = 0; n < ncomp; ++n) {
             fine(i,j,k,n+scomp) = crse(ic,jc,kc,n);
         }
-#if 0
         if (ic != per_grown_domain.smallEnd(0) && ic != per_grown_domain.bigEnd(0) && rr[0] > 1) {
             Real sfx = Real(1.0);
             for (int n = 0; n < ncomp; ++n) {
@@ -144,7 +139,6 @@ void interp_face_reg (int i, int j, int k, IntVect const& rr, Array4<Real> const
                 fine(i,j,k,n+scomp) += yoff * slope(i,j,k,n) * sfy;
             }
         }
-#endif
     }
 }
 
diff --git a/Src/AmrCore/AMReX_Interpolater.cpp b/Src/AmrCore/AMReX_Interpolater.cpp
index 339a1f9dcd0..ec036b05399 100644
--- a/Src/AmrCore/AMReX_Interpolater.cpp
+++ b/Src/AmrCore/AMReX_Interpolater.cpp
@@ -422,7 +422,7 @@ FaceConservativeLinear::CoarseBox (const Box& fine, const IntVect& ratio)
 {
     IntVect ng(1);
     for (int i = 0; i < AMREX_SPACEDIM; i++) {
-        if (fine.type(i) == IndexType::NODE or ratio[i] == 1) {
+        if ( (fine.type(i) == IndexType::NODE) || (ratio[i] == 1) ) {
             ng[i] = 0;
         }
     }
@@ -451,8 +451,8 @@ FaceConservativeLinear::interp (const FArrayBox&     crse,
                                 const Geometry&      crse_geom,
                                 const Geometry&      fine_geom,
                                 Vector<BCRec> const& bcr,
-                                int                  actual_comp,
-                                int                  actual_state,
+                                int                  /*actual_comp*/,
+                                int                  /*actual_state*/,
                                 RunOn                runon)
 {
     //