diff --git a/scripts/guest/check_mounted_directories b/scripts/guest/check_mounted_directories
index b31de1ef895..63f7473b0fd 100755
--- a/scripts/guest/check_mounted_directories
+++ b/scripts/guest/check_mounted_directories
@@ -9,13 +9,15 @@ incrementNestingLevel
 
 if [[ ! -f "${MAGENTO_ROOT}/bin/magento" ]]; then
     error "Directory '${MAGENTO_ROOT}' was not mounted as expected and Magento code base is not accessible on the guest machine.
-        If your host is OSX or *nix, please make sure that Vagrant is able to mount NFS shares on your environment (see https://github.com/paliarush/magento2-vagrant-for-developers/issues/88#issuecomment-254854019 )"
+        If your host is OSX or *nix, please make sure that Vagrant is able to mount NFS shares on your environment (see https://github.com/paliarush/magento2-vagrant-for-developers/issues/88#issuecomment-254854019 ).
+        Also remove any stale declarations from /etc/exports on the host."
     exit 1
 fi
 
 if [[ ! -f "/vagrant/etc/config.yaml" ]]; then
     error "Directory '/vagrant/etc' was not mounted as expected by Vagrant and is not accessible on the guest machine.
-        Please make sure that Vagrant is able to mount VirtualBox shared folders on your environment (see https://www.vagrantup.com/docs/synced-folders/basic_usage.html )"
+        Please make sure that Vagrant is able to mount VirtualBox shared folders on your environment (see https://www.vagrantup.com/docs/synced-folders/basic_usage.html ).
+        Also remove any stale declarations from /etc/exports on the host."
     exit 1
 fi
 
diff --git a/scripts/host/check_mounted_directories.sh b/scripts/host/check_mounted_directories.sh
index f9c65856236..e6540b319d6 100755
--- a/scripts/host/check_mounted_directories.sh
+++ b/scripts/host/check_mounted_directories.sh
@@ -8,7 +8,8 @@ cd "${vagrant_dir}"
 if [[ ! -f "${vagrant_dir}/etc/guest/mysql/my.cnf" ]]; then
     error "Directory '${vagrant_dir}/etc' was not mounted as expected by Vagrant.
         Please make sure that 'paliarush/magento2.ubuntu' Vagrant box was downloaded successfully (if not, this may help http://stackoverflow.com/questions/35519389/vagrant-cannot-find-box)
-        And that Vagrant is able to mount VirtualBox shared folders on your environment (see https://www.vagrantup.com/docs/synced-folders/basic_usage.html )"
+        And that Vagrant is able to mount VirtualBox shared folders on your environment (see https://www.vagrantup.com/docs/synced-folders/basic_usage.html ).
+        Also remove any stale declarations from /etc/exports on the host."
     exit 1
 fi
 vagrant ssh -c "bash /vagrant/scripts/guest/check_mounted_directories" 2> >(logError)
diff --git a/scripts/provision/upgrade_environment_recurring.sh b/scripts/provision/upgrade_environment_recurring.sh
index 79c399f60da..a6d4b171c07 100755
--- a/scripts/provision/upgrade_environment_recurring.sh
+++ b/scripts/provision/upgrade_environment_recurring.sh
@@ -101,7 +101,7 @@ function install_php71 () {
     apt-get install -y php7.1-dev
     cd /usr/lib
     rm -rf xdebug71
-    git clone git://github.com/xdebug/xdebug.git
+    git clone git://github.com/xdebug/xdebug.git xdebug71
     cd xdebug71
     phpize
     ./configure --enable-xdebug
@@ -137,7 +137,7 @@ function install_php72 () {
     apt-get install -y php7.2-dev
     cd /usr/lib
     rm -rf xdebug72
-    git clone git://github.com/xdebug/xdebug.git
+    git clone git://github.com/xdebug/xdebug.git xdebug72
     cd xdebug72
     phpize
     ./configure --enable-xdebug