diff --git a/src/Pstream/mpi/Make/options b/src/Pstream/mpi/Make/options
index 43a48312c42c76a6f500f502d306a5c7e1016c94..8fcb7016f81a290e860556bfe163cac4d36838bd 100644
--- a/src/Pstream/mpi/Make/options
+++ b/src/Pstream/mpi/Make/options
@@ -1,5 +1,5 @@
 sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
+sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB)
 
 EXE_INC  = $(PFLAGS) $(PINC) $(c++LESSWARN)
 LIB_LIBS = $(PLIBS)
diff --git a/src/conversion/vtk/part/foamVtuSizingTemplates.C b/src/conversion/vtk/part/foamVtuSizingTemplates.C
index 4bfda81ac636f81ef536340979c8e2cb7407429e..b070ab67da4b002dbd5a52ced2d6cede56917907 100644
--- a/src/conversion/vtk/part/foamVtuSizingTemplates.C
+++ b/src/conversion/vtk/part/foamVtuSizingTemplates.C
@@ -571,7 +571,8 @@ void Foam::vtk::vtuSizing::populateArrays
             if (output == contentType::LEGACY)
             {
                 // Update size for legacy face stream
-                faceOutput[startLabel] = (faceIndexer - startLabel);
+                // (subtract 1 to avoid counting the storage location)
+                faceOutput[startLabel] = (faceIndexer - 1 - startLabel);
             }
             else
             {
diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options
index 72c681656641cb76f35515d6f49326244c29f02b..0fcafd255977ebd21454be422e771870e3269072 100644
--- a/src/parallel/decompose/ptscotchDecomp/Make/options
+++ b/src/parallel/decompose/ptscotchDecomp/Make/options
@@ -1,5 +1,5 @@
 sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
+sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB)
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \
diff --git a/src/parallel/decompose/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options
index ebf3fa21b439dfefba0f3a5ba56039285b333a21..d98ed6ce43f08e67396e8f1170f9cdba9e716ddc 100644
--- a/src/parallel/decompose/scotchDecomp/Make/options
+++ b/src/parallel/decompose/scotchDecomp/Make/options
@@ -3,7 +3,7 @@
  * This is purely to avoid scotch.h including mpicxx.h, which causes problems.
  */
 sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
+sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB)
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \
diff --git a/src/renumber/zoltanRenumber/Make/options b/src/renumber/zoltanRenumber/Make/options
index 79dc4f2bc899c9fe6d9fa890fb3e03075bd7a11f..2d1fd2e105f4e02cc2b11f81d11a74aa131f783c 100644
--- a/src/renumber/zoltanRenumber/Make/options
+++ b/src/renumber/zoltanRenumber/Make/options
@@ -1,5 +1,5 @@
 sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
+sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB)
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \
diff --git a/wmake/rules/General/ADIOS b/wmake/rules/General/ADIOS
index 87bda2c75204b30516a278532120340376ee487e..c2cb3558ae21d83cdda2c88023684b2af08a95c0 100644
--- a/wmake/rules/General/ADIOS
+++ b/wmake/rules/General/ADIOS
@@ -2,7 +2,7 @@
 # ADIOS includes/libraries
 
 sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
+sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB)
 
 # Obtain compile/link flags via adios_config
 ADIOS_INC  := $(shell $(ADIOS_ARCH_PATH)/bin/adios_config -c)
diff --git a/wmake/rules/General/ADIOS2 b/wmake/rules/General/ADIOS2
index f158236942ce7a3883a793b4b94c33143bf26726..c880d0c3b97ee62265070b54d73ba142f059eb5b 100644
--- a/wmake/rules/General/ADIOS2
+++ b/wmake/rules/General/ADIOS2
@@ -2,7 +2,7 @@
 # ADIOS2 includes/libraries
 
 sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
+sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB)
 
 # Obtain prefix and library information via adios2-config
 ADIOS_PREFIX := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --prefix)