diff --git a/Source/Initialization/REMORA_init.cpp b/Source/Initialization/REMORA_init.cpp
index 07ab397..44ea786 100644
--- a/Source/Initialization/REMORA_init.cpp
+++ b/Source/Initialization/REMORA_init.cpp
@@ -172,8 +172,8 @@ REMORA::set_2darrays (int lev)
         });
     }
 
-    FillPatch(lev, t_new[lev], *vec_ubar[lev], GetVecOfPtrs(vec_ubar), BdyVars::ubar,0,false,false);
-    FillPatch(lev, t_new[lev], *vec_vbar[lev], GetVecOfPtrs(vec_vbar), BdyVars::vbar,0,false,false);
+    FillPatch(lev, t_new[lev], *vec_ubar[lev], GetVecOfPtrs(vec_ubar), BCVars::ubar_bc, BdyVars::ubar,0,false,false);
+    FillPatch(lev, t_new[lev], *vec_vbar[lev], GetVecOfPtrs(vec_vbar), BCVars::vbar_bc, BdyVars::vbar,0,false,false);
 }
 
 void
diff --git a/Source/TimeIntegration/REMORA_setup_step.cpp b/Source/TimeIntegration/REMORA_setup_step.cpp
index 9bb9075..6d78d31 100644
--- a/Source/TimeIntegration/REMORA_setup_step.cpp
+++ b/Source/TimeIntegration/REMORA_setup_step.cpp
@@ -338,10 +338,10 @@ REMORA::setup_step (int lev, Real time, Real dt_lev)
     }
     nstp = 0;
 
-    FillPatch(lev, time, *cons_old[lev], cons_old, BdyVars::t);
-    FillPatch(lev, time, *cons_new[lev], cons_new, BdyVars::t);
+    FillPatch(lev, time, *cons_old[lev], cons_old, BCVars::cons_bc, BdyVars::t);
+    FillPatch(lev, time, *cons_new[lev], cons_new, BCVars::cons_bc, BdyVars::t);
 
-    FillPatch(lev, time, *vec_sstore[lev], GetVecOfPtrs(vec_sstore), BdyVars::t);
+    FillPatch(lev, time, *vec_sstore[lev], GetVecOfPtrs(vec_sstore), BCVars::cons_bc, BdyVars::t);
 
     // Don't actually want to apply boundary conditions here
     vec_Huon[lev]->FillBoundary(geom[lev].periodicity());