diff --git a/man/freedombone-image.1.gz b/man/freedombone-image.1.gz
index 4c75a87a..6b14b000 100644
Binary files a/man/freedombone-image.1.gz and b/man/freedombone-image.1.gz differ
diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 3b3d91a1..80a59a0f 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -757,6 +757,7 @@ function setup_ipfs {
     su -c "systemctl --user start ipfs" - $MY_USERNAME
 
     if [ -d /home/$MY_USERNAME/Public ]; then
+        rm /home/$MY_USERNAME/Desktop/Public
         rm -rf /home/$MY_USERNAME/Public
     fi
 
@@ -803,6 +804,7 @@ function setup_ipfs {
             mkdir /home/$MY_USERNAME/Public
             echo $'Files within this directory will be publicly visible on the network' > /home/$MY_USERNAME/Public/README.txt
             chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Public
+            ln -s /home/$MY_USERNAME/Public /home/$MY_USERNAME/Desktop/Public
             su -c "echo \$($IPFS_COMMAND add -rq /home/$MY_USERNAME/Public | tail -n 1) > $IPFS_PUBLIC" - $MY_USERNAME
             if [ ! -f $IPFS_PUBLIC ]; then
                 echo $'Unable to create public IPFS directory' >> $INSTALL_LOG
diff --git a/src/freedombone-image-vmdebootstrap b/src/freedombone-image-vmdebootstrap
index d9182569..38299617 100755
--- a/src/freedombone-image-vmdebootstrap
+++ b/src/freedombone-image-vmdebootstrap
@@ -38,7 +38,7 @@ else
     git clone git://git.liw.fi/vmdebootstrap vendor/vmdebootstrap
 fi
 cd vendor/vmdebootstrap
-git checkout tags/vmdebootstrap-0.8
+git checkout tags/vmdebootstrap-0.8 -b tags/vmdebootstrap-0.8
 for f in ../../vendor-patches/vmdebootstrap/* ; do
     echo applying $(basename $f)
     patch -p1 < $f