diff --git a/ndisc6/Makefile b/ndisc6/Makefile
deleted file mode 100644
index bb83a4311..000000000
--- a/ndisc6/Makefile
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Copyright (C) 2006-2012 OpenWrt.org
-# Copyright (C) 2018-2022 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ndisc6
-PKG_VERSION:=1.0.7
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://www.remlab.net/files/ndisc6/$(PKG_SOURCE)
-PKG_HASH:=edc431d70510d7321a5a39d243de0d0f63846dc9145b3b549c7348cc2bc96609
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ndisc
-  SECTION:=ipv6
-  CATEGORY:=IPv6
-  SUBMENU:=IPv6 discovery tools
-  TITLE:=IPv6 discovery tools
-  URL:=http://www.remlab.net/ndisc6/
-  DEPENDS:=+libpthread +librt
-endef
-
-define Package/ndisc/description
-IPv6 discovery tools
-endef
-
-define Package/ndisc6
-  $(call Package/ndisc)
-  TITLE:=An ICMPv6 neighbour discovery tool
-endef
-
-define Package/ndisc6/description
-An ICMPv6 neighbour discovery tools
-endef
-
-define Package/rdisc6
-  $(call Package/ndisc)
-  TITLE:=An ICMPv6 router discovery tool
-endef
-
-define Package/rdisc6/description
-An ICMPv6 router discovery tool
-endef
-
-define Package/traceroute6
-  $(call Package/ndisc)
-  TITLE:=An IPv6-based traceroute implementation
-endef
-
-define Package/traceroute6/description
-An IPv6-based traceroute implementation
-endef
-
-define Package/rdnssd
-  $(call Package/ndisc)
-  TITLE:=DNS server discovery daemon
-endef
-
-define Package/rdnssd/description
-A recursive DNS server discovery daemon gathering
-information through stateless IPv6 autoconfiguration (RFC5006)
-endef
-
-TARGET_CFLAGS += -std=c99
-
-define Package/ndisc6/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndisc6 $(1)/usr/bin/
-endef
-
-define Package/rdisc6/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rdisc6 $(1)/usr/bin/
-endef
-
-define Package/traceroute6/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{rl,tcp}traceroute6 $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tracert6 $(1)/usr/bin/
-endef
-
-define Package/rdnssd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rdnssd $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,ndisc6))
-$(eval $(call BuildPackage,rdisc6))
-$(eval $(call BuildPackage,traceroute6))
-$(eval $(call BuildPackage,rdnssd))
diff --git a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
index f746af284..9a8edfc77 100755
--- a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
+++ b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
@@ -241,9 +241,7 @@ done
 
 uci -q batch <<-EOF >/dev/null
 	set firewall.zone_lan.mtu_fix='1'
-	set firewall.zone_vpn.mtu_fix='1'
-EOF
-uci -q batch <<-EOF >/dev/null
+	set firewall.zone_vpn.mtu_fix='0'
 	set firewall.@include[0].reload='1'
 	commit firewall
 EOF
diff --git a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
index 75a947d27..28f19bda0 100755
--- a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
+++ b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
@@ -12,7 +12,7 @@ if [ "$(uci -q get network.omrvpn)" = "" ]; then
 		set network.omrvpn.leasetime=12h
 		set network.omrvpn.type=tunnel
 		set network.omrvpn.txqueuelen=100
-		set network.omrvpn.metric=1200
+		set network.omrvpn.metric=9000
 		commit network
 	EOF
 fi
@@ -146,7 +146,12 @@ if [ "$(uci -q get glorytun-udp.vpn.key)" = "" ] && [ "$(uci -q get glorytun.vpn
 	uci -q commit glorytun-udp
 fi
 
-
+if [ "$(uci -q get network.omrvpn.metric)" = "1200" ]; then
+	uci -q batch <<-EOF >/dev/null
+		set network.omrvpn.metric=9000
+		commit network
+	EOF
+fi
 
 rm -f /tmp/luci-indexcache
 exit 0