diff --git a/etc/settings.csh b/etc/settings.csh
index d36a91ad5b..d0a1e99665 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -35,8 +35,6 @@
 alias _foamAddPath 'set path=(\!* $path)'
 # prefix to LD_LIBRARY_PATH
 alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}'
-# make directory if it doesn't already exist
-alias _foamMkDir 'if ( ! -d \!* ) mkdir -p \!*'
 
 # location of the jobControl directory
 setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl
@@ -71,12 +69,6 @@ _foamAddPath $FOAM_USER_APPBIN
 _foamAddLib  $FOAM_LIBBIN
 _foamAddLib  $FOAM_USER_LIBBIN
 
-# create these directories if necessary:
-_foamMkDir $FOAM_LIBBIN
-_foamMkDir $FOAM_APPBIN
-_foamMkDir $FOAM_USER_LIBBIN
-_foamMkDir $FOAM_USER_APPBIN
-
 
 # Select compiler installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -130,9 +122,6 @@ case OPENMPI:
 
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin
-    _foamMkDir   $MPI_ARCH_PATH/lib
 
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -147,9 +136,6 @@ case LAM:
 
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin
-    _foamMkDir   $MPI_ARCH_PATH/lib
 
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -163,9 +149,6 @@ case MPICH:
 
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin
-    _foamMkDir   $MPI_ARCH_PATH/lib
 
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -180,9 +163,6 @@ case MPICH-GM:
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
     _foamAddLib  $GM_LIB_PATH
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin
-    _foamMkDir   $MPI_ARCH_PATH/lib
 
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/mpich-gm
     breaksw
@@ -246,8 +226,6 @@ default:
 endsw
 
 _foamAddLib $FOAM_MPI_LIBBIN
-# before compiling, this directory may not exist:
-_foamMkDir  $FOAM_MPI_LIBBIN
 
 
 # Set the minimum MPI buffer size (used by all platforms except SGI MPI)
@@ -281,7 +259,6 @@ endif
 # ~~~~~~~~~~~~~~~~~~~~
 unalias _foamAddPath
 unalias _foamAddLib
-unalias _foamMkDir
 unset minBufferSize
 
 # -----------------------------------------------------------------------------
diff --git a/etc/settings.sh b/etc/settings.sh
index 046f624cde..14258eac67 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -52,17 +52,6 @@ _foamAddLib()
 }
 
 
-# make directories if they don't already exist
-_foamMkDir()
-{
-   while [ $# -ge 1 ]
-   do
-      [ -d $1 ] || mkdir -p $1
-      shift
-   done
-}
-
-
 # location of the jobControl directory
 export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl
 
@@ -94,9 +83,6 @@ export PATH=$WM_DIR:$WM_PROJECT_DIR/bin:$PATH
 _foamAddPath $FOAM_APPBIN $FOAM_USER_APPBIN
 _foamAddLib  $FOAM_LIBBIN $FOAM_USER_LIBBIN
 
-# create these directories if necessary:
-_foamMkDir $FOAM_LIBBIN $FOAM_USER_LIBBIN $FOAM_APPBIN $FOAM_USER_APPBIN
-
 
 # Compiler settings
 # ~~~~~~~~~~~~~~~~~
@@ -160,8 +146,6 @@ OPENMPI)
 
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin $MPI_ARCH_PATH/lib
 
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -176,8 +160,6 @@ LAM)
 
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin $MPI_ARCH_PATH/lib
 
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -191,8 +173,6 @@ MPICH)
 
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin $MPI_ARCH_PATH/lib
 
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -207,8 +187,6 @@ MPICH-GM)
     _foamAddPath $MPI_ARCH_PATH/bin
     _foamAddLib  $MPI_ARCH_PATH/lib
     _foamAddLib  $GM_LIB_PATH
-    # before compiling, these directories may not exist:
-    _foamMkDir   $MPI_ARCH_PATH/bin $MPI_ARCH_PATH/lib
 
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpich-gm
     ;;
@@ -274,8 +252,6 @@ QSMPI)
 esac
 
 _foamAddLib $FOAM_MPI_LIBBIN
-# before compiling, this directory may not exist:
-_foamMkDir  $FOAM_MPI_LIBBIN
 
 
 # Set the minimum MPI buffer size (used by all platforms except SGI MPI)
@@ -304,6 +280,6 @@ export MPI_BUFFER_SIZE
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unset _foamAddPath _foamAddLib _foamMkDir minBufferSize
+unset _foamAddPath _foamAddLib minBufferSize
 
 # -----------------------------------------------------------------------------
diff --git a/src/ODE/ODESolvers/SIBS/SIBS.C b/src/ODE/ODESolvers/SIBS/SIBS.C
index 99b03346b5..ec5c196ff0 100644
--- a/src/ODE/ODESolvers/SIBS/SIBS.C
+++ b/src/ODE/ODESolvers/SIBS/SIBS.C
@@ -71,8 +71,8 @@ void Foam::SIBS::solve
     const ODE& ode,
     scalar& x,
     scalarField& y,
-    scalarField& dydx, 
-    const scalar eps, 
+    scalarField& dydx,
+    const scalar eps,
     const scalarField& yScale,
     const scalar hTry,
     scalar& hDid,
@@ -96,7 +96,7 @@ void Foam::SIBS::solve
         {
             for (register label k=0; k<iq; k++)
             {
-                alpha_[k][iq] = 
+                alpha_[k][iq] =
                     pow(eps1, (a_[k + 1] - a_[iq + 1])
                    /((a_[iq + 1] - a_[0] + 1.0)*(2*k + 3)));
             }
diff --git a/src/ODE/ODESolvers/SIBS/SIBS.H b/src/ODE/ODESolvers/SIBS/SIBS.H
index 03e3535bdf..ff08b81ac9 100644
--- a/src/ODE/ODESolvers/SIBS/SIBS.H
+++ b/src/ODE/ODESolvers/SIBS/SIBS.H
@@ -29,8 +29,8 @@ Description
     Foam::SIBS
 
 SourceFiles
-    SIBSCK.C
-    SIBSQS.C
+    SIMPR.C
+    polyExtrapolate.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -61,7 +61,7 @@ class SIBS
 
         mutable scalarField a_;
         mutable scalarSquareMatrix alpha_;
-        mutable scalarSquareMatrix d_p_;
+        mutable scalarRectangularMatrix d_p_;
         mutable scalarField x_p_;
         mutable scalarField err_;
 
@@ -75,30 +75,31 @@ class SIBS
         mutable scalar epsOld_, xNew_;
 
 
-void SIMPR
-(
-    const ODE& ode,
-    const scalar xStart,
-    const scalarField& y,
-    const scalarField& dydx,
-    const scalarField& dfdx,
-    const scalarSquareMatrix& dfdy,
-    const scalar deltaX,
-    const label nSteps,
-    scalarField& yEnd
-) const;
+    // Private member functions
 
+        void SIMPR
+        (
+            const ODE& ode,
+            const scalar xStart,
+            const scalarField& y,
+            const scalarField& dydx,
+            const scalarField& dfdx,
+            const scalarSquareMatrix& dfdy,
+            const scalar deltaX,
+            const label nSteps,
+            scalarField& yEnd
+        ) const;
 
-void polyExtrapolate
-(
-    const label iest,
-    const scalar xest,
-    const scalarField& yest,
-    scalarField& yz,
-    scalarField& dy,
-    scalarField& x_p,
-    scalarSquareMatrix& d_p
-) const;
+        void polyExtrapolate
+        (
+            const label iest,
+            const scalar xest,
+            const scalarField& yest,
+            scalarField& yz,
+            scalarField& dy,
+            scalarField& x_p,
+            scalarRectangularMatrix& d_p
+        ) const;
 
 
 public:
diff --git a/src/ODE/ODESolvers/SIBS/polyExtrapolate.C b/src/ODE/ODESolvers/SIBS/polyExtrapolate.C
index a9c93329d6..6a05e1600a 100644
--- a/src/ODE/ODESolvers/SIBS/polyExtrapolate.C
+++ b/src/ODE/ODESolvers/SIBS/polyExtrapolate.C
@@ -36,7 +36,7 @@ void Foam::SIBS::polyExtrapolate
     scalarField& yz,
     scalarField& dy,
     scalarField& x,
-    scalarSquareMatrix& d
+    scalarRectangularMatrix& d
 ) const
 {
     label n = yz.size();
diff --git a/src/thermophysicalModels/combustion/Make/files b/src/thermophysicalModels/combustion/Make/files
index fb7defdcb6..70e985783d 100644
--- a/src/thermophysicalModels/combustion/Make/files
+++ b/src/thermophysicalModels/combustion/Make/files
@@ -13,7 +13,7 @@ reactingMixture     = $(mixtures)/reactingMixture
 $(chemistryReader)/chemistryReader.C
 $(foamChemistryReader)/foamChemistryReader.C
 $(chemkinReader)/chemkinReader.C
-$(chemkinReader)/chemkinLexer.C
+$(chemkinReader)/chemkinLexer.L
 
 $(combustionMixture)/combustionMixture.C
 $(reactingMixture)/reactingMixture.C