diff --git a/source/installguide/hypervisor/kvm.rst b/source/installguide/hypervisor/kvm.rst
index 1a9b501917..c3eae79c3c 100644
--- a/source/installguide/hypervisor/kvm.rst
+++ b/source/installguide/hypervisor/kvm.rst
@@ -289,42 +289,6 @@ cloudstack-agent and should already be installed.
 #. Turning on "listen\_tcp" in libvirtd.conf is not enough, we have to
    change the parameters as well:
 
-   On RHEL or CentOS modify ``/etc/sysconfig/libvirtd``:
-
-   Uncomment the following line:
-
-   .. parsed-literal::
-
-      #LIBVIRTD_ARGS="--listen"
-
-   On Ubuntu 14.04: modify ``/etc/default/libvirt-bin``
-
-   Add "-l" to the following line
-
-   .. parsed-literal::
-
-      libvirtd_opts="-d"
-
-   so it looks like:
-
-   .. parsed-literal::
-
-      libvirtd_opts="-d -l"
-
-   And modify ``/etc/init/libvirt-bin.conf``
-
-   Add "-l" to the following line
-
-   .. parsed-literal::
-
-      env libvirtd_opts="-d"
-
-   so it looks like:
-
-   .. parsed-literal::
-
-      env libvirtd_opts="-d -l"
-
    On Ubuntu 16.04: just modify ``/etc/default/libvirt-bin``
 
    Uncomment and change the following line
diff --git a/source/installguide/management-server/_database.rst b/source/installguide/management-server/_database.rst
index 3fb29039c2..16c6fb65fc 100644
--- a/source/installguide/management-server/_database.rst
+++ b/source/installguide/management-server/_database.rst
@@ -22,8 +22,9 @@ node, you can install the MySQL server locally. For an installation that
 has multiple management server nodes, we assume the MySQL database also
 runs on a separate node.
 
-CloudStack has been tested with MySQL 5.1 and 5.5. These versions are
-included in RHEL/CentOS and Ubuntu.
+CloudStack has been tested with MySQL 5.1, 5.5 and 8.0. The versions 5.1
+and 5.5 are included in RHEL/CentOS and Ubuntu.
+For MySQL 8.0 please refer to the offical / community repositories of the product.
 
 
 Install the Database on the Management Server Node
@@ -293,6 +294,9 @@ same node for MySQL. See `“Install the Database on the Management Server Node
 
       sudo service mysql restart
 
+	.. note::
+	Before performing a reboot of the management server please check if MySQL is configured to start automatically.
+	
 #. (CentOS and RHEL only; not required on Ubuntu)
 
    .. warning::
@@ -391,6 +395,6 @@ same node for MySQL. See `“Install the Database on the Management Server Node
       On RHEL and CentOS systems, firewalld (installed by default) will override all 
       iptables rules set by the cloudstack-setup-management script, 
       so ensure that the firewalld is disabled or ensure the correct firewalld rules
-      are in place to allow traffic to ports 8080, 8250 and 9090 to the management server.
+      are in place to allow traffic to ports 8080, 8250, 8443 and 9090 to the management server.
       
    
diff --git a/source/installguide/management-server/_nfs.rst b/source/installguide/management-server/_nfs.rst
index 98df3cb5f6..d23ccea7b0 100644
--- a/source/installguide/management-server/_nfs.rst
+++ b/source/installguide/management-server/_nfs.rst
@@ -237,12 +237,34 @@ operating system version.
    #. Log back in to the hypervisor host and try to mount the /export
       directories. For example, substitute your own management server
       name:
-
-      .. parsed-literal::
-
-         mkdir /primary
-         mount -t nfs <management-server-name>:/export/primary
-         umount /primary
-         mkdir /secondary
-         mount -t nfs <management-server-name>:/export/secondary
-         umount /secondary
+	
+		#. Create directories for testing.
+
+			.. parsed-literal::
+			
+			 mkdir /primary /secondary
+			
+		#. Mount the NFS shares.
+
+			.. parsed-literal::
+			
+			 mount -t nfs <management-server-name>:/export/primary /primary
+			 mount -t nfs <management-server-name>:/export/secondary /secondary
+			
+		#. Verify that the shares are mounted correctly.
+
+			.. parsed-literal::
+			
+			 findmnt -lo source,target,fstype | grep nfs
+			
+		#. Unmount the NFS shares.
+
+			.. parsed-literal::
+			
+			 umount /primary /secondary
+			
+		#.	Remove the beforehand created directories.
+
+			.. parsed-literal::
+			
+			 rm -rf /primary /secondary