diff --git a/package/libs/libselinux/Makefile b/package/libs/libselinux/Makefile
index b0b2491cc9..aea1e49e5c 100644
--- a/package/libs/libselinux/Makefile
+++ b/package/libs/libselinux/Makefile
@@ -50,6 +50,7 @@ HOST_MAKE_FLAGS += \
 MAKE_FLAGS += \
 	FTS_LDLIBS=-lfts \
 	SHLIBDIR=/usr/lib \
+	OS=Linux
 
 define Build/Compile
 	$(call Build/Compile/Default,all)
diff --git a/package/libs/libsepol/Makefile b/package/libs/libsepol/Makefile
index cd49ed008d..5309523659 100644
--- a/package/libs/libsepol/Makefile
+++ b/package/libs/libsepol/Makefile
@@ -36,7 +36,8 @@ HOST_MAKE_FLAGS += \
 	SHLIBDIR=$(STAGING_DIR_HOSTPKG)/lib
 
 MAKE_FLAGS += \
-	SHLIBDIR=/usr/lib
+	SHLIBDIR=/usr/lib \
+	OS=Linux
 
 define Build/Compile
 	$(call Build/Compile/Default,all)
diff --git a/package/lienol/luci-app-passwall/Makefile b/package/lienol/luci-app-passwall/Makefile
index f4f24ddaa9..7268548d36 100644
--- a/package/lienol/luci-app-passwall/Makefile
+++ b/package/lienol/luci-app-passwall/Makefile
@@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
 PKG_VERSION:=3.9
-PKG_RELEASE:=36
-PKG_DATE:=20200812
+PKG_RELEASE:=37
+PKG_DATE:=20200813
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_config.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_config.lua
index 8d40222c8b..216d263393 100644
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_config.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_config.lua
@@ -85,9 +85,11 @@ end
 if api.is_finded("brook") then
     type:value("Brook", translate("Brook"))
 end
+--[[
 if api.is_finded("trojan-plus") or api.is_finded("trojan") then
     type:value("Trojan", translate("Trojan"))
 end
+]]--
 if api.is_finded("trojan-plus") then
     type:value("Trojan-Plus", translate("Trojan-Plus"))
 end
diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua
index f6f0e1972e..1b29fc9471 100644
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua
@@ -69,9 +69,11 @@ end
 if api.is_finded("brook") then
     type:value("Brook", translate("Brook"))
 end
+--[[
 if api.is_finded("trojan-plus") or api.is_finded("trojan") then
     type:value("Trojan", translate("Trojan"))
 end
+]]--
 if api.is_finded("trojan-plus") then
     type:value("Trojan-Plus", translate("Trojan-Plus"))
 end
@@ -246,7 +248,7 @@ tls_sessionTicket:depends("stream_security", "tls")
 tls_serverName = s:option(Value, "tls_serverName", translate("Domain"))
 tls_serverName:depends("stream_security", "tls")
 
-tls_allowInsecure = s:option(Flag, "tls_allowInsecure", translate("allowInsecure"), translate("Whether unsafe connections are allowed. When checked, V2Ray does not check the validity of the TLS certificate provided by the remote host."))
+tls_allowInsecure = s:option(Flag, "tls_allowInsecure", translate("allowInsecure"), translate("Whether unsafe connections are allowed. When checked, Certificate validation will be skipped."))
 tls_allowInsecure.default = "0"
 tls_allowInsecure:depends("stream_security", "tls")
 
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm
index 5f9ee96956..2d7ce87a5f 100644
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm
+++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm
@@ -566,7 +566,7 @@ local dsp = require "luci.dispatcher"
 			opt.set('address', ssm.add);
 			opt.set('port', ssm.port);
 			opt.set('alter_id', ssm.aid);
-			opt.set('vmess_id', ssm.id);
+			opt.set('uuid', ssm.id);
 			opt.set('stream_security', ssm.tls === "tls" ? "tls" : "none");
 			opt.get('stream_security').dispatchEvent(event);
 			if (ssm.tls === "tls") {
diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
index 32d0570744..0824bb5aa4 100755
--- a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
+++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
@@ -289,9 +289,9 @@ load_config() {
 	else
 		process=$(config_t_get global_forwarding process)
 	fi
-	LOCAL_DNS=$(config_t_get global up_china_dns dnsbyisp | sed 's/:/#/g')
+	LOCAL_DNS=$(config_t_get global up_china_dns default | sed 's/:/#/g')
 	[ -f "${RESOLVFILE}" ] && [ -s "${RESOLVFILE}" ] || RESOLVFILE=/tmp/resolv.conf.auto
-	DEFAULT_DNS=$(sed -n 's/^nameserver[ \t]*\([^ ]*\)$/\1/p' "${RESOLVFILE}" | grep -v "0.0.0.0" | grep -v "127.0.0.1" | grep -v "^::$" | head -2 | tr '\n' ',')
+	DEFAULT_DNS=$(echo -n $(sed -n 's/^nameserver[ \t]*\([^ ]*\)$/\1/p' "${RESOLVFILE}" | grep -v "0.0.0.0" | grep -v "127.0.0.1" | grep -v "^::$" | head -2) | tr ' ' ',')
 	if [ "${LOCAL_DNS}" = "default" ]; then
 		IS_DEFAULT_DNS=1
 		LOCAL_DNS="${DEFAULT_DNS:-119.29.29.29}"
diff --git a/tools/coreutils/Makefile b/tools/coreutils/Makefile
index e338796053..05c8040fa5 100644
--- a/tools/coreutils/Makefile
+++ b/tools/coreutils/Makefile
@@ -16,7 +16,7 @@ PKG_HASH:=8891d349ee87b9ff7870f52b6d9312a9db672d2439d289bc57084771ca21656b
 
 HOST_BUILD_PARALLEL := 1
 
-BUILD_PROGRAMS = date readlink touch
+BUILD_PROGRAMS = date readlink touch ln
 
 include $(INCLUDE_DIR)/host-build.mk