diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index 0625de8d91c240bc1ec4d2854072520c32fe8e5d..4a817a10015c11d0a1d59e9ab5199917dbf6a195 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -35,7 +35,6 @@
     {
         phaseModel& phase = iter();
 
-        phase.phi().oldTime();
         mrfZones.absoluteFlux(phase.phi().oldTime());
         mrfZones.absoluteFlux(phase.phi());
 
@@ -173,7 +172,6 @@
                 phase.phi() =
                     phiHbyAs[phasei]
                   + rAlphaAUfs[phasei]*mSfGradp/phase.rho();
-                mrfZones.relativeFlux(phase.phi());
                 mrfZones.relativeFlux(phase.phi().oldTime());
                 phi += alphafs[phasei]*phase.phi();
 
@@ -206,7 +204,7 @@
                       + rAlphaAUfs[phasei]*mSfGradp/phase.rho()
                     );
 
-                phase.U() = fvc::reconstruct(phase.phi());
+                // phase.U() = fvc::reconstruct(phase.phi());
                 phase.U().correctBoundaryConditions();
 
                 U += alpha*phase.U();
diff --git a/etc/bashrc b/etc/bashrc
index 0d2f264ae2586237204d1f51cd8ba84e130dcd6e..7907ce303a36d6f65bf684701a4be5f121c6180c 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -80,7 +80,7 @@ export WM_COMPILE_OPTION=Opt
 
 #- MPI implementation:
 #    WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI
-#               | GAMMA | MPI | QSMPI
+#               | GAMMA | MPI | QSMPI | SGIMPI
 export WM_MPLIB=OPENMPI
 
 #- Operating System:
diff --git a/etc/cshrc b/etc/cshrc
index be397d532329329cdb783b567dfd813f4b0e214e..6b5eb166324b615e67a75aa505f937ae909ce28f 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -80,7 +80,7 @@ setenv WM_COMPILE_OPTION Opt
 
 #- MPI implementation:
 #    WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI
-#               | GAMMA | MPI | QSMPI
+#               | GAMMA | MPI | QSMPI | SGIMPI
 setenv WM_MPLIB OPENMPI
 
 #- Operating System:
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index 573b6e520664374f7ba3765849e5890ad805c521..ab18fad6e27e28ef6957442b03edccb32f306200 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -307,12 +307,20 @@ void Foam::decompositionMethod::calcCellCells
     // Done as postprocessing step since we now have cellCells.
     label newIndex = 0;
     labelHashSet nbrCells;
+
+
+    if (cellCells.size() == 0)
+    {
+        return;
+    }
+
+    label startIndex = cellCells.offsets()[0];
+
     forAll(cellCells, cellI)
     {
         nbrCells.clear();
         nbrCells.insert(globalAgglom.toGlobal(cellI));
 
-        label startIndex = cellCells.offsets()[cellI];
         label endIndex = cellCells.offsets()[cellI+1];
 
         for (label i = startIndex; i < endIndex; i++)
@@ -322,16 +330,21 @@ void Foam::decompositionMethod::calcCellCells
                 cellCells.m()[newIndex++] = cellCells.m()[i];
             }
         }
+        startIndex = endIndex;
         cellCells.offsets()[cellI+1] = newIndex;
     }
 
     cellCells.m().setSize(newIndex);
 
-
     //forAll(cellCells, cellI)
     //{
-    //    const labelUList cCells = cellCells[cellI];
+    //    Pout<< "Original: Coarse cell " << cellI << endl;
+    //    forAll(mesh.cellCells()[cellI], i)
+    //    {
+    //        Pout<< "    nbr:" << mesh.cellCells()[cellI][i] << endl;
+    //    }
     //    Pout<< "Compacted: Coarse cell " << cellI << endl;
+    //    const labelUList cCells = cellCells[cellI];
     //    forAll(cCells, i)
     //    {
     //        Pout<< "    nbr:" << cCells[i] << endl;