diff --git a/applications/solvers/multiphase/bubbleFoam/createPhia.H b/applications/solvers/multiphase/bubbleFoam/createPhia.H
index ac0418c5dc..2b2781d753 100644
--- a/applications/solvers/multiphase/bubbleFoam/createPhia.H
+++ b/applications/solvers/multiphase/bubbleFoam/createPhia.H
@@ -6,24 +6,26 @@
         IOobject::NO_READ
     );
 
-
-    surfaceScalarField* phiaPtr;
+    autoPtr<surfaceScalarField> phiaPtr(NULL);
 
     if (phiaHeader.headerOk())
     {
         Info<< "Reading face flux field phia\n" << endl;
 
-        phiaPtr = new surfaceScalarField
+        phiaPtr.reset
         (
-            IOobject
+            new surfaceScalarField
             (
-                "phia",
-                runTime.timeName(),
-                mesh,
-                IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
-            ),
-            mesh
+                IOobject
+                (
+                    "phia",
+                    runTime.timeName(),
+                    mesh,
+                    IOobject::MUST_READ,
+                    IOobject::AUTO_WRITE
+                ),
+                mesh
+            )
         );
     }
     else
@@ -44,19 +46,22 @@
             }
         }
 
-        phiaPtr = new surfaceScalarField
+        phiaPtr.reset
         (
-            IOobject
+            new surfaceScalarField
             (
-                "phia",
-                runTime.timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            fvc::interpolate(Ua) & mesh.Sf(),
-            phiTypes
+                IOobject
+                (
+                    "phia",
+                    runTime.timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::AUTO_WRITE
+                ),
+                fvc::interpolate(Ua) & mesh.Sf(),
+                phiTypes
+            )
         );
     }
 
-    surfaceScalarField& phia = *phiaPtr;
+    surfaceScalarField& phia = phiaPtr();
diff --git a/applications/solvers/multiphase/bubbleFoam/createPhib.H b/applications/solvers/multiphase/bubbleFoam/createPhib.H
index bdf4c46bcc..84db6492b6 100644
--- a/applications/solvers/multiphase/bubbleFoam/createPhib.H
+++ b/applications/solvers/multiphase/bubbleFoam/createPhib.H
@@ -6,24 +6,26 @@
         IOobject::NO_READ
     );
 
-
-    surfaceScalarField* phibPtr;
+    autoPtr<surfaceScalarField> phibPtr(NULL);
 
     if (phibHeader.headerOk())
     {
         Info<< "Reading face flux field phib\n" << endl;
 
-        phibPtr = new surfaceScalarField
+        phibPtr.reset
         (
-            IOobject
+            new surfaceScalarField
             (
-                "phib",
-                runTime.timeName(),
-                mesh,
-                IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
-            ),
-            mesh
+                IOobject
+                (
+                    "phib",
+                    runTime.timeName(),
+                    mesh,
+                    IOobject::MUST_READ,
+                    IOobject::AUTO_WRITE
+                ),
+                mesh
+            )
         );
     }
     else
@@ -44,19 +46,22 @@
             }
         }
 
-        phibPtr = new surfaceScalarField
+        phibPtr.reset
         (
-            IOobject
+            new surfaceScalarField
             (
-                "phib",
-                runTime.timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            fvc::interpolate(Ub) & mesh.Sf(),
-            phiTypes
+                IOobject
+                (
+                    "phib",
+                    runTime.timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::AUTO_WRITE
+                ),
+                fvc::interpolate(Ub) & mesh.Sf(),
+                phiTypes
+            )
         );
     }
 
-    surfaceScalarField& phib = *phibPtr;
+    surfaceScalarField& phib = phibPtr();
diff --git a/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C b/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C
index f25716d0e8..4ea4c4d989 100644
--- a/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C
+++ b/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C
@@ -80,7 +80,7 @@ Foam::threePhaseMixture::threePhaseMixture
         viscosityModel::New
         (
             "nu3",
-            subDict(phase2Name_),
+            subDict(phase3Name_),
             U,
             phi
         )
diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc
index 51965e47d6..e160fa59e8 100644
--- a/etc/apps/paraview3/bashrc
+++ b/etc/apps/paraview3/bashrc
@@ -50,9 +50,9 @@ do
 done
 
 
-# set VERSION and MAJOR (version) variables if not already set
-[ -n "$ParaView_VERSION" ] || ParaView_VERSION=3.8.0
-[ -n "$ParaView_MAJOR" ]   || ParaView_MAJOR=unknown
+# set VERSION and MAJOR (version) variables
+ParaView_VERSION=3.8.0
+ParaView_MAJOR=unknown
 
 # if needed, set MAJOR version to correspond to VERSION
 # ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
@@ -95,4 +95,5 @@ fi
 
 
 unset cleaned cmake paraviewInstDir paraviewPython
+
 # -----------------------------------------------------------------------------
diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc
index a69608c9d3..cdbe92277a 100644
--- a/etc/apps/paraview3/cshrc
+++ b/etc/apps/paraview3/cshrc
@@ -48,9 +48,9 @@ foreach cmake ( cmake-2.8.1 cmake-2.8.0 cmake-2.6.4 )
     endif
 end
 
-# set VERSION and MAJOR (version) variables if not already set
-if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.8.0
-if ( ! $?ParaView_MAJOR ) setenv ParaView_MAJOR unknown
+# set VERSION and MAJOR (version) variables
+setenv ParaView_VERSION 3.8.0
+setenv ParaView_MAJOR unknown
 
 # if needed, set MAJOR version to correspond to VERSION
 # ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
@@ -91,4 +91,5 @@ endif
 
 
 unset cleaned cmake paraviewInstDir paraviewPython
+
 # -----------------------------------------------------------------------------
diff --git a/etc/bashrc b/etc/bashrc
index ad866d049b..e5c050b44f 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -32,7 +32,7 @@
 #------------------------------------------------------------------------------
 
 export WM_PROJECT=OpenFOAM
-[ -z "$WM_PROJECT_VERSION" ] && export WM_PROJECT_VERSION=dev
+export WM_PROJECT_VERSION=dev
 
 ################################################################################
 # USER EDITABLE PART. Note changes made here may be lost with the next upgrade
diff --git a/etc/cellModels b/etc/cellModels
index eb6f1b9507..a90eaa94e7 100644
--- a/etc/cellModels
+++ b/etc/cellModels
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
+|  \\    /   O peration     | Version:  1.7                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/controlDict b/etc/controlDict
index 691e970124..f989950f26 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
+|  \\    /   O peration     | Version:  1.7                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/cshrc b/etc/cshrc
index 9f55d62ab6..7ceff2ff58 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -31,7 +31,7 @@
 #------------------------------------------------------------------------------
 
 setenv WM_PROJECT OpenFOAM
-if ( ! $?WM_PROJECT_VERSION ) setenv WM_PROJECT_VERSION dev
+setenv WM_PROJECT_VERSION dev
 
 ################################################################################
 # USER EDITABLE PART. Note changes made here may be lost with the next upgrade