diff --git a/source/Grid/GridSolvers/HYPRE/MHD/Grid_advanceMagDiffusion.F90 b/source/Grid/GridSolvers/HYPRE/MHD/Grid_advanceMagDiffusion.F90
index 0fbafce85f..d22019506b 100644
--- a/source/Grid/GridSolvers/HYPRE/MHD/Grid_advanceMagDiffusion.F90
+++ b/source/Grid/GridSolvers/HYPRE/MHD/Grid_advanceMagDiffusion.F90
@@ -225,7 +225,7 @@ subroutine Grid_advanceMagDiffusion (iVar, iSrc, iFactorsB, iFactorA, bcTypes, b
   !!        now done by HYPRE implicitly.
   !!-----------------------------------------------------------------------
   call gr_hypreComputeB (blockCount, blockList, iVar, -1, -1, -1.0, theta, &
-       bcTypes, bcValues)
+       bcTypes(:,1), bcValues(:,:,1))
   
   !!-----------------------------------------------------------------------
   !!     4c. Compute part of the actual A matrix in AX=B if not done in 4a.
diff --git a/source/Grid/GridSolvers/HYPRE/MHD/UG/gr_hypreCreateMatrixMag.F90 b/source/Grid/GridSolvers/HYPRE/MHD/UG/gr_hypreCreateMatrixMag.F90
index b6b8642ca4..6c3b084be3 100644
--- a/source/Grid/GridSolvers/HYPRE/MHD/UG/gr_hypreCreateMatrixMag.F90
+++ b/source/Grid/GridSolvers/HYPRE/MHD/UG/gr_hypreCreateMatrixMag.F90
@@ -499,14 +499,14 @@ subroutine gr_hypreCreateMatrixMag(iVar, iFactorsB, iFactorA, bcTypes, bcValues,
                     call addNormTerm(ii+1,ii+2,resimh,resiph,dx,2)
                  endif
 #if NDIM > 1
-                 if (notLowerJBoundary) call myGetFaceValues(JLO_FACE)
-                 if (notUpperJBoundary) call myGetFaceValues(JHI_FACE)
+                 if (notLowerJBoundary) call myGetFaceValues(JLO_FACE,cylgeo)
+                 if (notUpperJBoundary) call myGetFaceValues(JHI_FACE,cylgeo)
                  resjmh = isoresjmh + aniresjmh*bxjmh*bxjmh
                  resjph = isoresjph + aniresjph*bxjph*bxjph
-                 call addNormTerm(ii+3,ii+4,resjmh,resjph,dy,2)
+                 call addNormTerm(ii+3,ii+4,resjmh,resjph,dy,2,cylgeo)
 #if NDIM > 2
-                 call myGetFaceValues(ILO_FACE)
-                 call myGetFaceValues(IHI_FACE)
+                 call myGetFaceValues(ILO_FACE,cylgeo)
+                 call myGetFaceValues(IHI_FACE,cylgeo)
                  resimh = isoresimh + aniresimh*byimh*byimh
                  resiph = isoresiph + aniresiph*byiph*byiph
                  call addTransTerm(KAXIS, 2, resimh, resiph, dz, 0, &
@@ -1092,7 +1092,6 @@ contains
     real :: inv_dVr_im, inv_dVr_ip
 
     compOffset = comp*nentries/gr_hypreNVars
-    if (compOffset /= 0) return
 
     if (present(notLowerRBoundary)) then
        rdirection = .true.