diff --git a/setup/dovecot-fts-xapian.sh b/setup/dovecot-fts-xapian.sh
index 47afda8d..67e553b5 100755
--- a/setup/dovecot-fts-xapian.sh
+++ b/setup/dovecot-fts-xapian.sh
@@ -17,7 +17,7 @@ source /etc/mailinabox.conf # load global vars
 
 echo "Installing fts-xapian..."
 
-apt_install libxapian30
+apt_install dovecot-fts-xapian
 
 # Update the dovecot plugin configuration
 #
@@ -35,7 +35,7 @@ if [ ! -f /usr/lib/dovecot/decode2text.sh ]; then
 	cp -f /usr/share/doc/dovecot-core/examples/decode2text.sh /usr/lib/dovecot
 fi
 
-cp -f lib/lib21_fts_xapian_plugin.so /usr/lib/dovecot/modules/
+#cp -f lib/lib21_fts_xapian_plugin.so /usr/lib/dovecot/modules/
 
 # Create configuration file
 cat > /etc/dovecot/conf.d/90-plugin-fts.conf << EOF;
diff --git a/setup/system.sh b/setup/system.sh
index ef0f4870..4a43e616 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -262,7 +262,7 @@ EOF
 if [ ! -d /etc/systemd/system/apt-daily-upgrade.timer.d ]; then
 	mkdir /etc/systemd/system/apt-daily-upgrade.timer.d
 fi
-cat /etc/systemd/system/apt-daily-upgrade.timer.d/override.conf <<EOF;
+cat > /etc/systemd/system/apt-daily-upgrade.timer.d/override.conf <<EOF;
 [Timer]
 OnCalendar=
 OnCalendar=*-*-* 23:30
@@ -336,17 +336,15 @@ fi #NODOC
 # remove bind9 in case it is still there
 apt-get purge -qq -y bind9 bind9-utils
 
-# Install unbound and dns utils (e.g. dig)
-apt_install unbound python3-unbound bind9-dnsutils
-
 # Configure unbound
 cp -f conf/unbound.conf /etc/unbound/unbound.conf.d/miabunbound.conf
 
-if [ -d /etc/unbound/lists.d ]; then
+if [ ! -d /etc/unbound/lists.d ]; then
 	mkdir /etc/unbound/lists.d
 fi
 
-systemctl restart unbound
+# Install unbound and dns utils (e.g. dig)
+apt_install unbound python3-unbound bind9-dnsutils
 
 unbound-control -q status
 
diff --git a/setup/webmail.sh b/setup/webmail.sh
index fce6b9af..120e4f7a 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -23,7 +23,7 @@ echo "Installing Roundcube (webmail)..."
 apt_install \
 	dbconfig-common \
 	php-cli php-sqlite3 php-intl php-json php-common php-curl php-ldap \
-	php-gd php-pspell tinymce libjs-jquery libjs-jquery-mousewheel libmagic1 php-mbstring
+	php-gd php-pspell libjs-jquery libjs-jquery-mousewheel libmagic1 php-mbstring
 
 # Install Roundcube from source if it is not already present or if it is out of date.
 # Combine the Roundcube version number with the commit hash of plugins to track