diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp
index 9f0db4286..ee8027b05 100755
--- a/mptcp/files/etc/init.d/mptcp
+++ b/mptcp/files/etc/init.d/mptcp
@@ -48,13 +48,29 @@ interface_macaddr_count() {
 
 interface_max_metric() {
 	local config="$1"
-	config_get metric "$config" metric
-	if [ "$metric" = "$count" ]; then
-		count=$((count+1))
-		config_set "$config" metric $count
-	fi
-	if [ "$metric" -gt "$count" ]; then
-		count=$metric
+	if [ "$1" != "omrvpn" ] && [ "$1" != "omr6in4" ]; then
+		config_get metric "$config" metric
+		if [ "$metric" = "$count" ]; then
+			count=$((count+1))
+			config_set "$config" metric $count
+		fi
+		if [ "$metric" -gt "$count" ]; then
+			count=$metric
+		fi
+	elif [ "$1" = "omrvpn" ]; then
+		uci -q batch <<-EOF >/dev/null
+			set network.${config}.metric=1200
+			commit network
+			set openmptcprouter.${config}.metric=1200
+			commit openmptcprouter
+		EOF
+	elif [ "$1" = "omr6in4" ]; then
+		uci -q batch <<-EOF >/dev/null
+			set network.${config}.metric=1201
+			commit network
+			set openmptcprouter.${config}.metric=1201
+			commit openmptcprouter
+		EOF
 	fi
 }
 
diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
index d18ad3bea..20fcc07c7 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -247,10 +247,12 @@ disable_pihole() {
 	if [ -n "$(uci -q get dhcp.@dnsmasq[0].server | grep '#53' | grep '10.2')" ]; then
 		_log "Disable Pi-Hole..."
 		uci -q del_list dhcp.@dnsmasq[0].server="$(uci -q get dhcp.@dnsmasq[0].server | tr ' ' '\n' | grep '#53' | grep '10.2')"
-		uci -q batch <<-EOF >/dev/null
-			add_list dhcp.@dnsmasq[0].server='127.0.0.1#5353'
-			commit dhcp
-		EOF
+		if [ -z "$(uci -q get dhcp.@dnsmasq[0].server | grep '127.0.0.1#5353')" ]; then
+			uci -q batch <<-EOF >/dev/null
+				add_list dhcp.@dnsmasq[0].server='127.0.0.1#5353'
+				commit dhcp
+			EOF
+		fi
 		/etc/init.d/dnsmasq restart
 	fi
 }
@@ -727,7 +729,12 @@ if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.lc)" = "" ] || [ $(($(
 	else
 		[ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && _log "Get status and settings for $OMR_TRACKER_INTERFACE... Done"
 		uci -q commit openmptcprouter
-		#/etc/init.d/openmptcprouter-vps restart >/dev/null 2>&1
+		if [ "$(pgrep openmptcprouter-vps)" = "" ] && ( [ "$(uci -q get openmptcprouter.settings.apilc)" = "" ] || [ $(($(date +"%s") - $(uci -q get openmptcprouter.settings.apilc))) -gt 3600 ] ); then
+			_log "Check API configuration..."
+			/etc/init.d/openmptcprouter-vps restart >/dev/null 2>&1
+			uci -q set openmptcprouter.settings.apilc=$(date +"%s")
+			_log "Check API configuration... Done"
+		fi
 	fi
 	dns_flush
 fi