diff --git a/Exec/gravity_tests/DustCollapse/problem_bc_fill.H b/Exec/gravity_tests/DustCollapse/problem_bc_fill.H
index 2a8df96b84..5c9225eb40 100644
--- a/Exec/gravity_tests/DustCollapse/problem_bc_fill.H
+++ b/Exec/gravity_tests/DustCollapse/problem_bc_fill.H
@@ -5,8 +5,8 @@ AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void problem_bc_fill(int i, int j, int k,
                      Array4<Real> const& state,
                      Real time,
-                     Array1D<BCRec, 0, NUM_STATE-1> bcs,
-                     GeometryData geomdata)
+                     const Array1D<BCRec, 0, NUM_STATE-1>& bcs,
+                     const GeometryData& geomdata)
 {
 #if AMREX_SPACEDIM == 3
     const Real* dx = geomdata.CellSize();
diff --git a/Exec/gravity_tests/hydrostatic_adjust/problem_bc_fill.H b/Exec/gravity_tests/hydrostatic_adjust/problem_bc_fill.H
index 96ab44b365..428c8d16ba 100644
--- a/Exec/gravity_tests/hydrostatic_adjust/problem_bc_fill.H
+++ b/Exec/gravity_tests/hydrostatic_adjust/problem_bc_fill.H
@@ -5,8 +5,8 @@ AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void problem_bc_fill(int i, int j, int k,
                      Array4<Real> const& state,
                      Real time,
-                     Array1D<BCRec, 0, NUM_STATE-1> bcs,
-                     GeometryData geomdata)
+                     const Array1D<BCRec, 0, NUM_STATE-1>& bcs,
+                     const GeometryData& geomdata)
 {
     // Set the velocity to zero at the top physical boundary.
 
diff --git a/Exec/hydro_tests/Noh/problem_bc_fill.H b/Exec/hydro_tests/Noh/problem_bc_fill.H
index 3c79eb0741..3a6470744f 100644
--- a/Exec/hydro_tests/Noh/problem_bc_fill.H
+++ b/Exec/hydro_tests/Noh/problem_bc_fill.H
@@ -8,8 +8,8 @@ AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void problem_bc_fill(int i, int j, int k,
                      Array4<Real> const& state,
                      Real time,
-                     Array1D<BCRec, 0, NUM_STATE-1> bcs,
-                     GeometryData geomdata)
+                     const Array1D<BCRec, 0, NUM_STATE-1>& bcs,
+                     const GeometryData& geomdata)
 {
     const Real pres_init = 1.0e-6_rt;
     const Real rho_init = 1.0e0_rt;
diff --git a/Exec/hydro_tests/double_mach_reflection/problem_bc_fill.H b/Exec/hydro_tests/double_mach_reflection/problem_bc_fill.H
index c1edfe36c7..ba28f4a2f8 100644
--- a/Exec/hydro_tests/double_mach_reflection/problem_bc_fill.H
+++ b/Exec/hydro_tests/double_mach_reflection/problem_bc_fill.H
@@ -5,8 +5,8 @@ AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void problem_bc_fill(int i, int j, int k,
                      Array4<Real> const& state,
                      Real time,
-                     Array1D<BCRec, 0, NUM_STATE-1> bcs,
-                     GeometryData geomdata)
+                     const Array1D<BCRec, 0, NUM_STATE-1>& bcs,
+                     const GeometryData& geomdata)
 {
     const int* domlo = geomdata.Domain().loVect();
     const int* domhi = geomdata.Domain().hiVect();
diff --git a/Exec/radiation_tests/Rad2Tshock/problem_bc_fill.H b/Exec/radiation_tests/Rad2Tshock/problem_bc_fill.H
index bb2f45ce6d..4a7a301b69 100644
--- a/Exec/radiation_tests/Rad2Tshock/problem_bc_fill.H
+++ b/Exec/radiation_tests/Rad2Tshock/problem_bc_fill.H
@@ -5,8 +5,8 @@ AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void problem_bc_fill(int i, int j, int k,
                      Array4<Real> const& state,
                      Real time,
-                     Array1D<BCRec, 0, NUM_STATE-1> bcs,
-                     GeometryData geomdata)
+                     const Array1D<BCRec, 0, NUM_STATE-1>& bcs,
+                     const GeometryData& geomdata)
 {
     // The strategy here is to set Dirichlet condition for inflow and
     // outflow boundaries, and let the Riemann solver sort out the
diff --git a/Exec/science/Detonation/problem_bc_fill.H b/Exec/science/Detonation/problem_bc_fill.H
index 1692b7df09..9070d5fe4d 100644
--- a/Exec/science/Detonation/problem_bc_fill.H
+++ b/Exec/science/Detonation/problem_bc_fill.H
@@ -45,8 +45,8 @@ AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void problem_bc_fill(int i, int j, int k,
                      Array4<Real> const& state,
                      Real time,
-                     Array1D<BCRec, 0, NUM_STATE-1> bcs,
-                     GeometryData geomdata)
+                     const Array1D<BCRec, 0, NUM_STATE-1>& bcs,
+                     const GeometryData& geomdata)
 {
     // Override the generic routine at the physical boundaries by
     // setting the material to the ambient state. Note that we
diff --git a/Source/driver/Castro.H b/Source/driver/Castro.H
index 9cc45996c3..11b028f5f9 100644
--- a/Source/driver/Castro.H
+++ b/Source/driver/Castro.H
@@ -1487,8 +1487,10 @@ protected:
 /// sdc
 ///
     int sdc_iteration;
-    int current_sdc_node;
 
+#ifdef TRUE_SDC
+    int current_sdc_node;
+#endif
 
 
 /* problem-specific includes */
diff --git a/Source/driver/sum_integrated_quantities.cpp b/Source/driver/sum_integrated_quantities.cpp
index 6dc1be4004..2398480765 100644
--- a/Source/driver/sum_integrated_quantities.cpp
+++ b/Source/driver/sum_integrated_quantities.cpp
@@ -131,7 +131,7 @@ Castro::sum_integrated_quantities ()
             auto R = R_new[mfi].array();
 #endif
 
-            auto level_mask = mask_available ? mask_mf[mfi].array() : Array4<Real>{};
+            const auto & level_mask = mask_available ? mask_mf[mfi].array() : Array4<Real>{};
 
             reduce_op.eval(bx, reduce_data,
             [=] AMREX_GPU_DEVICE (int i, int j, int k) -> ReduceTuple
diff --git a/Source/gravity/Gravity.H b/Source/gravity/Gravity.H
index c2c4ca8ebf..af7ff177fa 100644
--- a/Source/gravity/Gravity.H
+++ b/Source/gravity/Gravity.H
@@ -449,7 +449,6 @@ public:
   amrex::Vector<amrex::MultiFab*> area;
 
   int Density;
-  int finest_level;
   int finest_level_allocated;
 
   amrex::BCRec*       phys_bc;
diff --git a/Source/gravity/Gravity.cpp b/Source/gravity/Gravity.cpp
index 6665b0ef38..d67087d469 100644
--- a/Source/gravity/Gravity.cpp
+++ b/Source/gravity/Gravity.cpp
@@ -97,6 +97,7 @@ Gravity::Gravity(Amr* Parent, int _finest_level, BCRec* _phys_bc, int _density)
          init_multipole_grav();
      }
      max_rhs = 0.0;
+     numpts_at_level = -1;
 }
 
 Gravity::~Gravity() = default;
@@ -1569,7 +1570,7 @@ Gravity::compute_radial_mass(const Box& bx,
                         r     = std::sqrt(xxsq + yysq + zzsq);
                         index = static_cast<int>(r * drinv);
 
-                        Real vol_frac;
+                        Real vol_frac{};
 
                         if (coord_type == 0) {
 
diff --git a/Source/problems/problem_bc_fill.H b/Source/problems/problem_bc_fill.H
index 29c6815b46..1eeb1589a4 100644
--- a/Source/problems/problem_bc_fill.H
+++ b/Source/problems/problem_bc_fill.H
@@ -15,8 +15,8 @@
 AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void problem_bc_fill(int i, int j, int k,
                       Array4<Real> const& state,
-                      Real time, Array1D<BCRec, 0, NUM_STATE-1> bcs,
-                      GeometryData geomdata) {
+                      Real time, const Array1D<BCRec, 0, NUM_STATE-1>& bcs,
+                      const GeometryData& geomdata) {
 
     amrex::ignore_unused(i);
     amrex::ignore_unused(j);
diff --git a/Source/reactions/Castro_react.cpp b/Source/reactions/Castro_react.cpp
index e050e2008f..9a53e398d3 100644
--- a/Source/reactions/Castro_react.cpp
+++ b/Source/reactions/Castro_react.cpp
@@ -201,7 +201,7 @@ Castro::react_state(MultiFab& s, MultiFab& r, Real time, Real dt, const int stra
         auto U = s.array(mfi);
         auto reactions = r.array(mfi);
         auto weights = store_burn_weights ? burn_weights.array(mfi) : Array4<Real>{};
-        auto mask = mask_covered_zones ? mask_mf.array(mfi) : Array4<Real>{};
+        const auto mask = mask_covered_zones ? mask_mf.array(mfi) : Array4<Real>{};
 
         const auto dx = geom.CellSizeArray();
 #ifdef MODEL_PARSER
@@ -535,7 +535,7 @@ Castro::react_state(Real time, Real dt)
         auto I     = SDC_react.array(mfi);
         auto react_src = reactions.array(mfi);
         auto weights = store_burn_weights ? burn_weights.array(mfi) : Array4<Real>{};
-        auto mask = mask_covered_zones ? mask_mf.array(mfi) : Array4<Real>{};
+        const auto mask = mask_covered_zones ? mask_mf.array(mfi) : Array4<Real>{};
 
         int lsdc_iteration = sdc_iteration;