diff --git a/Src/Base/AMReX_fort_mod.F90 b/Src/Base/AMReX_fort_mod.F90
index ad2a7e9c707..6dfd2220482 100644
--- a/Src/Base/AMReX_fort_mod.F90
+++ b/Src/Base/AMReX_fort_mod.F90
@@ -4,8 +4,8 @@ module amrex_fort_module
 
   implicit none
 
-  integer, parameter ::    bl_spacedim = BL_SPACEDIM
-  integer, parameter :: amrex_spacedim = BL_SPACEDIM
+  integer, parameter ::    bl_spacedim = AMREX_SPACEDIM
+  integer, parameter :: amrex_spacedim = AMREX_SPACEDIM
 
 #ifdef BL_USE_FLOAT
   integer, parameter :: amrex_real = c_float
diff --git a/Src/F_Interfaces/Base/AMReX_multifab_mod.F90 b/Src/F_Interfaces/Base/AMReX_multifab_mod.F90
index b075cf7057a..de953d60dfc 100644
--- a/Src/F_Interfaces/Base/AMReX_multifab_mod.F90
+++ b/Src/F_Interfaces/Base/AMReX_multifab_mod.F90
@@ -485,7 +485,7 @@ subroutine amrex_multifab_setval (this, val, icomp, ncomp, nghost)
     real(amrex_real), intent(in) :: val
     integer, intent(in), optional :: icomp, ncomp, nghost
     integer :: ic, nc, ng
-    ic = 0;         if (present(icomp))  ic = icomp
+    ic = 0;         if (present(icomp))  ic = icomp-1
     nc = this%nc;   if (present(ncomp))  nc = ncomp
     ng = this%ng;   if (present(nghost)) ng = nghost
     call amrex_fi_multifab_setval(this%p, val, ic, nc, ng)
@@ -502,7 +502,7 @@ subroutine amrex_multifab_parallel_copy (this, srcmf, geom)
     class(amrex_multifab) :: this
     type(amrex_multifab), intent(in) :: srcmf
     type(amrex_geometry), intent(in) :: geom
-    call amrex_fi_multifab_parallelcopy(this%p, srcmf%p, 0, 0, this%nc, 0, 0, geom%p)
+    call amrex_fi_multifab_parallelcopy(this%p, srcmf%p, 1, 1, this%nc, 0, 0, geom%p)
   end subroutine amrex_multifab_parallel_copy
 
   subroutine amrex_multifab_parallel_copy_c (this, srcmf, srccomp, dstcomp, nc, geom)