diff --git a/applications/solvers/multiphase/barotropicCavitatingFoam/pEqn.H b/applications/solvers/multiphase/barotropicCavitatingFoam/pEqn.H
index 5e69f7b51..84f5f0910 100644
--- a/applications/solvers/multiphase/barotropicCavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/barotropicCavitatingFoam/pEqn.H
@@ -4,7 +4,14 @@
     U = UEqn.H()/UEqn.A();
 
     phi = fvc::interpolate(U) & mesh.Sf();
-    surfaceScalarField phiU = phi;
+
+    // Bug fix: must change name of phi on copy to keep objectRegistry happy
+    // HJ, 7/Nov/2010
+    surfaceScalarField phiU
+    (
+        "phiU",
+        phi
+    );
 
     surfaceScalarField phip = fvc::interpolate(psiByRho)*phi;
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 07f00b108..9d70625d1 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -202,7 +202,14 @@ void Foam::kineticTheoryModel::solve()
 
     word scheme("div(phi,Theta)");
 
-    volScalarField alpha = alpha_;
+    // Bug fix: copying field alpha without mane change vreaks objectRegistry
+    // HJ, 7/Nov/2010
+    volScalarField alpha
+    (
+        "alphaMinMax",
+        alpha_
+    );
+
     alpha.max(1.0e-6);
     const scalar sqrtPi = sqrt(mathematicalConstant::pi);
 
diff --git a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockBiCGStab/BlockBiCGStabSolver.C b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockBiCGStab/BlockBiCGStabSolver.C
index c3acf2ac3..81fe45c6b 100644
--- a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockBiCGStab/BlockBiCGStabSolver.C
+++ b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockBiCGStab/BlockBiCGStabSolver.C
@@ -51,7 +51,7 @@ Foam::BlockBiCGStabSolver<Type>::BlockBiCGStabSolver
         BlockLduPrecon<Type>::New
         (
             matrix,
-            this->dict().subDict("preconditioner")
+            this->dict()
         )
     )
 {}
diff --git a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockCG/BlockCGSolver.C b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockCG/BlockCGSolver.C
index 90f3015be..1c07bb7b0 100644
--- a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockCG/BlockCGSolver.C
+++ b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockCG/BlockCGSolver.C
@@ -51,7 +51,7 @@ Foam::BlockCGSolver<Type>::BlockCGSolver
         BlockLduPrecon<Type>::New
         (
             matrix,
-            this->dict().subDict("preconditioner")
+            this->dict()
         )
     )
 {}
diff --git a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockGMRES/BlockGMRESSolver.C b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockGMRES/BlockGMRESSolver.C
index b91e1e56a..6415cf7bd 100644
--- a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockGMRES/BlockGMRESSolver.C
+++ b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockGMRES/BlockGMRESSolver.C
@@ -85,7 +85,7 @@ Foam::BlockGMRESSolver<Type>::BlockGMRESSolver
         BlockLduPrecon<Type>::New
         (
             matrix,
-            this->dict().subDict("preconditioner")
+            this->dict()
         )
     ),
     nDirs_(readLabel(this->dict().lookup("nDirections")))
diff --git a/tutorials/multiphase/barotropicCavitatingFoam/nozzle/constant/polyMesh/boundary b/tutorials/multiphase/barotropicCavitatingFoam/nozzle/constant/polyMesh/boundary
index d24523af0..a7369fd5c 100644
--- a/tutorials/multiphase/barotropicCavitatingFoam/nozzle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/barotropicCavitatingFoam/nozzle/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5-dev                               |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
+|  \\    /   O peration     | Version:  1.6-ext                               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
index 716ff9df0..faff6ed49 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
+|  \\    /   O peration     | Version:  1.6-ext                               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,25 +21,25 @@ FoamFile
     {
         type            patch;
         nFaces          51;
-        startFace       15151;
+        startFace       23114;
     }
     outlet
     {
         type            patch;
         nFaces          51;
-        startFace       15202;
+        startFace       23165;
     }
     walls
     {
         type            wall;
-        nFaces          436;
-        startFace       15253;
+        nFaces          512;
+        startFace       23216;
     }
     frontBack
     {
         type            empty;
-        nFaces          15420;
-        startFace       15689;
+        nFaces          23340;
+        startFace       23728;
     }
 )
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Theta
index 2a90cf25d..ca9413c39 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Theta
@@ -30,6 +30,7 @@ boundaryField
     top
     {
         type                inletOutlet;
+        phi                 phia;
         inletValue          uniform 1.0e-8;
     }
 
@@ -38,10 +39,10 @@ boundaryField
         type                zeroGradient;
     }
 
-	frontBack
-	{
-	type					empty;
-	}
+    frontBack
+    {
+        type                empty;
+    }
 
 }
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua
index e6329f0e6..5b75a1a34 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua
@@ -29,6 +29,7 @@ boundaryField
     top
     {
         type                inletOutlet;
+        phi                 phia;
         inletValue          uniform (0 0 0);
         value               uniform ( 0 0 0 );
     }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub
index e3f358469..0166992d7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub
@@ -29,6 +29,7 @@ boundaryField
     top
     {
         type                inletOutlet;
+        phi                 phib;
         value               uniform (0 0 0);
         inletValue          uniform ( 0 0 0 );
     }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha
index 1206ff1d0..e43d41225 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha
@@ -29,6 +29,7 @@ boundaryField
     top
     {
         type               inletOutlet;
+        phi                phia;
         inletValue         uniform 0;
     }
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/epsilon b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/epsilon
index ce7bfbfd0..7a4abf2d3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/epsilon
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/epsilon
@@ -29,6 +29,7 @@ boundaryField
     top
     {
         type               inletOutlet;
+        phi                phia;
         inletValue         uniform 10.0;
         value              uniform 10.0;
     }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/k b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/k
index 9dd101463..3a6c8df96 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/k
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/k
@@ -29,6 +29,7 @@ boundaryField
     top
     {
         type               inletOutlet;
+        phi                phia;
         inletValue         uniform 1.0;
         value              uniform 1.0;
     }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary
index 3ffe96207..abb32507d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
+|  \\    /   O peration     | Version:  1.6-ext                               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      binary;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub
index a387bc598..0e2e8804e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub
@@ -24,21 +24,21 @@ boundaryField
 {
     walls
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type                fixedValue;
+        value               uniform (0 0 0);
     }
     outlet
     {
-       type             zeroGradient;
+       type                 zeroGradient;
     }
     inlet
     {
-        type               fixedValue;
-        value              uniform (0 0.25 0);
+        type                fixedValue;
+        value               uniform (0 0.25 0);
     }
     frontAndBackPlanes
     {
-        type               empty;
+        type                empty;
     }
 }
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon
index 851e45fb1..3d853546e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon
@@ -29,6 +29,7 @@ boundaryField
     outlet
     {
         type               inletOutlet;
+        phi                phia;
         inletValue         uniform 10.0;
         value              uniform 10.0;
     }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k
index 4dff7d166..f70e3eb5b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k
@@ -29,6 +29,7 @@ boundaryField
     outlet
     {
         type               inletOutlet;
+        phi                phia;
         inletValue         uniform 1.0;
         value              uniform 1.0;
     }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
index 054f79b66..c42ba5e3e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
+|  \\    /   O peration     | Version:  1.6-ext                               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Theta
index bda749152..c8d428b0d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Theta
@@ -20,25 +20,26 @@ internalField   uniform 0.0;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform 1.0e-7;
     }
 
-    outlet          
+    outlet
     {
         type            inletOutlet;
+        phi             phia;
         inletValue      uniform 1.0e-7;
         value           uniform 1.0e-7;
     }
 
-    walls           
+    walls
     {
         type            zeroGradient;
     }
 
-    defaultFaces    
+    defaultFaces
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua
index e766923d8..53f9ef41b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua
@@ -1899,15 +1899,16 @@ internalField   nonuniform List<vector>
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform (0 0.1 0);
     }
 
-    outlet          
+    outlet
     {
         type            inletOutlet;
+        phi             phia;
         inletValue      uniform (0 0 0);
         value           nonuniform List<vector> 
 25
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub
index f42620e07..71fa54337 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub
@@ -1899,15 +1899,16 @@ internalField   nonuniform List<vector>
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    outlet          
+    outlet
     {
         type            inletOutlet;
+        phi             phib;
         inletValue      uniform (0 0 0);
         value           nonuniform List<vector> 
 25
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha
index 0e5fd7d7d..8b5a6effa 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha
@@ -1899,25 +1899,26 @@ internalField   nonuniform List<scalar>
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform 0.5;
     }
 
-    outlet          
+    outlet
     {
         type            inletOutlet;
+        phi             phia;
         inletValue      uniform 1;
         value           uniform 1;
     }
 
-    walls           
+    walls
     {
         type            zeroGradient;
     }
 
-    defaultFaces    
+    defaultFaces
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/epsilon b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/epsilon
index cbbe3a61f..003c07413 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/epsilon
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/epsilon
@@ -20,25 +20,26 @@ internalField   uniform 0.1;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform 0.1;
     }
 
-    outlet          
+    outlet
     {
         type            inletOutlet;
+        phi             phia;
         inletValue      uniform 0.1;
         value           uniform 0.1;
     }
 
-    walls           
+    walls
     {
         type            zeroGradient;
     }
 
-    defaultFaces    
+    defaultFaces
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/k b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/k
index f8bcd79c2..add6d8092 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/k
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/k
@@ -20,25 +20,26 @@ internalField   uniform 1e-8;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform 1e-8;
     }
 
-    outlet          
+    outlet
     {
         type            inletOutlet;
+        phi             phia;
         inletValue      uniform 1e-8;
         value           uniform 1e-8;
     }
 
-    walls           
+    walls
     {
         type            zeroGradient;
     }
 
-    defaultFaces    
+    defaultFaces
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
index cdffeb226..3cc351e7e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
+|  \\    /   O peration     | Version:  1.6-ext                               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,39 +10,37 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 4
 (
-inlet
-{
-    type patch;
-    nFaces 25;
-    startFace 3650;
-}
-
-outlet
-{
-    type patch;
-    nFaces 25;
-    startFace 3675;
-}
-
-walls
-{
-    type wall;
-    nFaces 150;
-    startFace 3700;
-}
-
-defaultFaces
-{
-    type empty;
-    nFaces 3750;
-    startFace 3850;
-}
+    inlet
+    {
+        type            patch;
+        nFaces          25;
+        startFace       3650;
+    }
+    outlet
+    {
+        type            patch;
+        nFaces          25;
+        startFace       3675;
+    }
+    walls
+    {
+        type            wall;
+        nFaces          150;
+        startFace       3700;
+    }
+    defaultFaces
+    {
+        type            empty;
+        nFaces          3750;
+        startFace       3850;
+    }
 )
 
 // ************************************************************************* //