diff --git a/mcord/mcord-in-a-box.sh b/mcord/mcord-in-a-box.sh
index bef96bf..d0b5b50 100755
--- a/mcord/mcord-in-a-box.sh
+++ b/mcord/mcord-in-a-box.sh
@@ -37,10 +37,12 @@
 cp ~/.ssh/id_rsa "$CORDDIR"/helm-charts/xos-profiles/base-openstack/files/node_key
 
 # Add dummy fabric interface
-sudo modprobe dummy
-sudo ip link set name fabric dev dummy0
-sudo ifconfig fabric up
-
+if ! ifconfig fabric &>> /dev/null
+then
+    sudo modprobe dummy
+    sudo ip link set name fabric dev dummy0
+    sudo ifconfig fabric up
+fi
 
 # Install charts for M-CORD
 cd "$CORDDIR"/helm-charts
@@ -63,12 +65,14 @@
 ~/openstack-helm/tools/deployment/common/wait-for-pods.sh default
 
 
-# Firewall VNC ports for security
-sudo ufw default allow incoming
-sudo ufw default allow outgoing
-sudo ufw default allow routed
-sudo ufw deny proto tcp from any to any port 5900:5950 comment 'vnc'
-sudo ufw --force enable
-
+# Firewall VNC ports for security (CloudLab)
+if [ -d /mnt/extra ]
+then
+    sudo ufw default allow incoming
+    sudo ufw default allow outgoing
+    sudo ufw default allow routed
+    sudo ufw deny proto tcp from any to any port 5900:5950 comment 'vnc'
+    sudo ufw --force enable
+fi
 
 echo "M-CORD has been successfully installed"
diff --git a/openstack-helm/cloudlab-disk-setup.sh b/openstack-helm/cloudlab-disk-setup.sh
index 0a3da8a..3aa7436 100755
--- a/openstack-helm/cloudlab-disk-setup.sh
+++ b/openstack-helm/cloudlab-disk-setup.sh
@@ -51,5 +51,8 @@
 do
     sudo mkdir -p /mnt/extra/$DIR
     sudo chmod -R a+rwx /mnt/extra/$DIR
-    [ ! -e /var/lib/$DIR ] && sudo ln -s /mnt/extra/$DIR /var/lib/$DIR
+    if [ ! -e /var/lib/$DIR ]
+    then
+        sudo ln -s /mnt/extra/$DIR /var/lib/$DIR
+    fi
 done