diff --git a/conf.py b/conf.py
index 4247e768ee1..c913d1b5292 100644
--- a/conf.py
+++ b/conf.py
@@ -105,7 +105,8 @@ def has(self, *args):
     'csharp-api': ('https://api.mongodb.com/csharp/current/html/%s.htm', ''),
     'csharp-docs': ('https://mongodb.github.io/mongo-csharp-driver/2.4/reference/%s', ''),
     'java-async-docs': ('http://mongodb.github.io/mongo-java-driver-reactivestreams/1.6/%s', ''),
-    'java-async-api': ('http://mongodb.github.io/mongo-java-driver-reactivestreams/1.6/javadoc/%s', '')
+    'java-async-api': ('http://mongodb.github.io/mongo-java-driver-reactivestreams/1.6/javadoc/%s', ''),
+    'bic': ('https://docs.mongodb.com/bi-connector/current%s','')
 }
 
 ## add `extlinks` for each published version.
diff --git a/source/includes/fact-mmapv1-big-endian.rst b/source/includes/fact-mmapv1-big-endian.rst
index 59bdac9926e..ec564058781 100644
--- a/source/includes/fact-mmapv1-big-endian.rst
+++ b/source/includes/fact-mmapv1-big-endian.rst
@@ -1,5 +1,6 @@
 .. important::
 
-   MMAPv1 is not supported on big-endian architectures such as s390x.
-   MongoDB returns an error if you set MMAPv1 as the
-   storage engine on a big-endian system.
+   :doc:`MMAPv1 </core/mmapv1>` is supported on 64-bit Intel
+   architectures (``x86_64``) only. MongoDB returns an error when
+   starting a :binary:`~bin.mongod` using MMAPv1 on an unsupported
+   architecture.
diff --git a/source/includes/list-table-products-supported-architecture.rst b/source/includes/list-table-products-supported-architecture.rst
index ea2a3407324..75a12da25b6 100644
--- a/source/includes/list-table-products-supported-architecture.rst
+++ b/source/includes/list-table-products-supported-architecture.rst
@@ -4,27 +4,35 @@ version of MongoDB products:
 
 .. list-table::
    :header-rows: 1
+   :widths: 40 15 15 15 15
    
    * - Product
-     - x86_64/amd64
+     - x86_64
+     - ppc64le
      - s390x
-     - POWER8 (little endian)
      - ARMv8-A
 
-   * - MongoDB 3.4
+   * - MongoDB Community (3.4+)
+     - |checkmark|
+     - 
+     - 
+     - |checkmark|
+
+
+   * - MongoDB Enterprise (3.4+)
+     - |checkmark|
+     - |checkmark|
      - |checkmark|
-     - MongoDB Enterprise only
-     - MongoDB Enterprise only
      - |checkmark|
 
 
-   * - `BI Connector <https://docs.mongodb.com/bi-connector/v2.0/>`__
+   * - :bic:`BI Connector </installation/>`
      - |checkmark|
      - |checkmark|
      - |checkmark|
      - 
 
-   * - `Compass <https://docs.mongodb.com/compass/current/>`__
+   * - `Compass <https://docs.mongodb.com/compass/current/install/>`__
      - |checkmark|
      -
      -
@@ -36,26 +44,26 @@ version of MongoDB products:
      -
      -
 
-   * - `Ops Manager <https://docs.opsmanager.mongodb.com/current/>`__
+   * - :opsmgr:`Ops Manager </core/requirements/index.html#hardware-compatibility-matrix-for-onprem-hosts>`
+     - |checkmark|
      - |checkmark|
-     -
      -
      -
 
-   * - Automation Agent
+   * - :opsmgr:`Automation Agent </core/requirements/index.html#compatibility-matrix-for-onprem-hosts>`
      - |checkmark|
-     -
      - |checkmark|
      -
+     -
 
-   * - Monitoring Agent
+   * - :opsmgr:`Monitoring Agent </core/requirements/index.html#compatibility-matrix-for-onprem-hosts>`
      - |checkmark|
-     -
      - |checkmark|
      -
+     -
 
-   * - Backup Agent
+   * - :opsmgr:`Backup Agent </core/requirements/index.html#compatibility-matrix-for-onprem-hosts>`
      - |checkmark|
-     -
      - |checkmark|
      -
+     -