diff --git a/golang-protobuf/Makefile b/golang-protobuf/Makefile
index 04cc930f4..1dd992c0f 100755
--- a/golang-protobuf/Makefile
+++ b/golang-protobuf/Makefile
@@ -25,7 +25,7 @@ GO_PKG:=github.com/golang/protobuf
 GO_PKG_SOURCE_ONLY:=1
 
 include $(INCLUDE_DIR)/package.mk
-include ../golang/golang-package.mk
+include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/golang-protobuf-dev
 $(call GoPackage/GoSubMenu)
diff --git a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
index 928feb60f..f55513bf2 100755
--- a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
+++ b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
@@ -181,9 +181,9 @@ start_service() {
 		rmmod fast_classifier 2>&1 >/dev/null
 	fi
 
-	if [ "$(uci -q get rpcd.@rpcd[0].socket)" != "/var/run/ubus/ubus.sock" ]; then
+	if [ "$(uci -q get rpcd.@rpcd[0].socket)" != "/var/run/ubus.sock" ]; then
 		uci -q batch <<-EOF >/dev/null
-			set rpcd.@rpcd[0].socket='/var/run/ubus/ubus.sock'
+			set rpcd.@rpcd[0].socket='/var/run/ubus.sock'
 			commit rpcd
 		EOF
 		/etc/init.d/rpcd restart 2>&1 >/dev/null
diff --git a/openmptcprouter/files/etc/uci-defaults/2060-omr-system b/openmptcprouter/files/etc/uci-defaults/2060-omr-system
index 4a4a37962..2ba0b41ae 100755
--- a/openmptcprouter/files/etc/uci-defaults/2060-omr-system
+++ b/openmptcprouter/files/etc/uci-defaults/2060-omr-system
@@ -17,9 +17,9 @@ uci -q batch <<-EOF >/dev/null
 	commit luci
 EOF
 
-if [ "$(uci -q get rpcd.@rpcd[0].socket)" != "/var/run/ubus/ubus.sock" ]; then
+if [ "$(uci -q get rpcd.@rpcd[0].socket)" != "/var/run/ubus.sock" ]; then
 	uci -q batch <<-EOF >/dev/null
-		set rpcd.@rpcd[0].socket='/var/run/ubus/ubus.sock'
+		set rpcd.@rpcd[0].socket='/var/run/ubus.sock'
 		commit rpcd
 	EOF
 fi
diff --git a/shadowsocks-v2ray-plugin/Makefile b/shadowsocks-v2ray-plugin/Makefile
index 5cc81054e..e50a54e7c 100755
--- a/shadowsocks-v2ray-plugin/Makefile
+++ b/shadowsocks-v2ray-plugin/Makefile
@@ -25,7 +25,7 @@ GO_PKG:=github.com/shadowsocks/v2ray-plugin
 PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
-include ../golang/golang-package.mk
+include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/v2ray-plugin
 	SECTION:=net