diff --git a/etc/config.csh/setup b/etc/config.csh/setup
index 51a92cd054..ecdea3b40f 100644
--- a/etc/config.csh/setup
+++ b/etc/config.csh/setup
@@ -5,11 +5,10 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2018-2019 OpenCFD Ltd.
+#     Copyright (C) 2018-2020 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # File
 #     etc/config.csh/setup
@@ -89,7 +88,7 @@ endif
 
 # Capture and evaluate any command-line parameters
 # These can be used to set/unset values, specify additional files etc.
-setenv FOAM_SETTINGS "${*}"
+setenv FOAM_SETTINGS "$argv[*]"
 
 while ( $#argv > 0 )
     switch ($argv[1])
diff --git a/etc/cshrc b/etc/cshrc
index 7e64e6b3bd..00b1303689 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -180,7 +180,7 @@ endif
 # Finalize setup of OpenFOAM environment
 if ( -d "$WM_PROJECT_DIR" ) then
     if ($?FOAM_VERBOSE && $?prompt) echo "source $WM_PROJECT_DIR/etc/config.csh/setup"
-    source "$WM_PROJECT_DIR/etc/config.csh/setup" "${*}"
+    source "$WM_PROJECT_DIR/etc/config.csh/setup" $argv[*]
 else
     echo "Error: did not locate installation path for $WM_PROJECT-$WM_PROJECT_VERSION"
     echo "No directory: $WM_PROJECT_DIR"
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
index c7d4b1bd05..70c9afd550 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
@@ -82,15 +82,18 @@ void Foam::primitiveMesh::makeCellCentresAndVols
 {
     typedef Vector<solveScalar> solveVector;
 
+    // Clear the fields for accumulation. Note1: we're doing this before
+    // any precision conversion since this might complain about illegal numbers.
+    // Note2: zero is a special value which is perfectly converted into zero
+    //        in the new precision
+    cellCtrs_s = Zero;
+    cellVols_s = 0.0;
+
     PrecisionAdaptor<solveVector, vector> tcellCtrs(cellCtrs_s);
     Field<solveVector>& cellCtrs = tcellCtrs.ref();
     PrecisionAdaptor<solveScalar, scalar> tcellVols(cellVols_s);
     Field<solveScalar>& cellVols = tcellVols.ref();
 
-    // Clear the fields for accumulation
-    cellCtrs = Zero;
-    cellVols = 0.0;
-
     const labelList& own = faceOwner();
     const labelList& nei = faceNeighbour();
 
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/README b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/README
index f2d6bff7c5..dbb1ccc0e4 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/README
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/README
@@ -13,5 +13,4 @@ Eddy Simulation (IDDES) model
 
 For further details please visit:
 
-    openfoam.com/documentation/cpp-guide/html/verification-validation-turbulent-surface-mounted-cube.html
-
+    https://www.openfoam.com/documentation/guides/latest/doc/verification-validation-turbulent-surface-mounted-cube.html