diff --git a/ndisc6/Makefile b/ndisc6/Makefile
index 76ebf9e08..990ec9a75 100644
--- a/ndisc6/Makefile
+++ b/ndisc6/Makefile
@@ -12,8 +12,8 @@ PKG_NAME:=ndisc6
 PKG_VERSION:=1.0.3
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.remlab.net/files/ndisc6
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.bz2
+PKG_SOURCE_URL:=http://deb.debian.org/debian/pool/main/n/ndisc6
 PKG_HASH:=0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821
 
 PKG_INSTALL:=1
diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index dcde475fc..1be9331a4 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -1072,7 +1072,7 @@ _vps_firewall_close_port() {
 				src_dport=$(echo $line | awk '{print $5}' | tr -d "\n")
 				source_port=$(echo $line | awk '{print $6}' | tr -d "\n")
 				source_dip=$(echo $line | awk '{print $7}' | tr -d "\n")
-				[ "$source_dip" = "#" ] && source_sip=""
+				[ "$source_dip" = "#" ] && source_dip=""
 				source_ip=$(echo $line | awk '{print $2}' | awk -F ":" '{print $2}' | tr -d "\n")
 				if [ "$source_port" = "-" ]; then
 					settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","source_dip": "'$source_dip'","source_ip": "'$source_ip'"}'
@@ -1097,7 +1097,7 @@ _vps_firewall_close_port() {
 				src_dport=$(echo $line | awk '{print $5}' | tr -d "\n")
 				source_port=$(echo $line | awk '{print $6}' | tr -d "\n")
 				source_dip=$(echo $line | awk '{print $7}' | tr -d "\n")
-				[ "$source_dip" = "#" ] && source_sip=""
+				[ "$source_dip" = "#" ] && source_dip=""
 				source_ip=$(echo $line | awk '{print $2}' | awk -F ":" '{print $2}' | tr -d "\n")
 				if [ "$source_port" = "-" ]; then
 					settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","ipproto" : "ipv6","source_dip": "'$source_dip'","source_ip": "'$source_ip'"}'
diff --git a/openmptcprouter/files/etc/uci-defaults/2030-omr-fstab b/openmptcprouter/files/etc/uci-defaults/2030-omr-fstab
index 575d0e238..15f2dd49f 100755
--- a/openmptcprouter/files/etc/uci-defaults/2030-omr-fstab
+++ b/openmptcprouter/files/etc/uci-defaults/2030-omr-fstab
@@ -4,11 +4,11 @@
 _set_fsck() {
 	uci -q batch <<-EOF >/dev/null
 		set "fstab.$1.enabled=1"
-		set "fstab.$1.enable_fsck=1"
+		set "fstab.$1.enabled_fsck=1"
 	EOF
 }
 
-/sbin/block detect > /etc/config/fstab
+[ -z "$(uci show fstab | grep mount)" ] && /sbin/block detect > /etc/config/fstab
 uci -q set fstab.@global[0].check_fs='1'
 config_load fstab
 config_foreach _set_fsck mount