diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index c55011dc..2b299b7c 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -85,6 +85,7 @@ function change_avahi_name {
 	sed -i "s|#host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf
 	sed -i "s|host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf
 	set_hostname P$PEER_ID
+	systemctl restart avahi-daemon
 
 	echo "New avahi name for this peer is P$PEER_ID"
 	toilet "mesh-$PEER_ID"
@@ -676,8 +677,13 @@ if [ -f $MESH_INSTALL_SETUP ]; then
 	if [ ! -f $MESH_AMNESIC ]; then
 		rm $MESH_INSTALL_SETUP
 		systemctl disable mesh-setup.service
+	else
+		# kill the MATE file manager which pops up when
+		# encrypted drives are mounted
+		pkill caja
 	fi
 
+
 	mesh_restart_daemons
 	if [ ! -f $MESH_INSTALL_COMPLETED ]; then
 		echo $'Mesh node setup complete' >> $INSTALL_LOG