diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless b/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
index 53db8709..6906fc36 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
@@ -234,7 +234,7 @@ local function configure_p2p(config, radio, index, suffix, disabled)
 		ssid = ssid,
 		mode = mode,
 		macaddr = macaddr,
-		mcast_rate = config.mcast_rate,
+		-- mcast_rate = config.mcast_rate,
 		ifname = suffix and 'p2p' .. suffix,
 		encryption = 'none',
 		disabled = disabled,
diff --git a/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/360-gluon-mesh-olsrd-setup-intf b/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/360-gluon-mesh-olsrd-setup-intf
index 324dc310..4f031acd 100755
--- a/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/360-gluon-mesh-olsrd-setup-intf
+++ b/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/360-gluon-mesh-olsrd-setup-intf
@@ -46,7 +46,12 @@ end
 -- get all mesh radios and mesh lans and then add them to olsrd
 wireless.foreach_radio(uci, function(radio, _, _)
 	local radio_name = radio['.name']
-	table.insert(intf.radio_mesh, 'mesh_' .. radio_name)
+	if uci:get('network', 'mesh_' .. radio_name, 'proto') then
+		table.insert(intf.radio_mesh, 'mesh_' .. radio_name)
+	end
+	if uci:get('network', 'p2p_' .. radio_name, 'proto') then
+		table.insert(intf.radio_mesh, 'p2p_' .. radio_name)
+	end
 	if uci:get('network', 'ibss_' .. radio_name, 'proto') then
 		table.insert(intf.radio_mesh, 'ibss_' .. radio_name)
 	end
diff --git a/package/gluon-web-wifi-config/luasrc/lib/gluon/config-mode/model/admin/wifi-config.lua b/package/gluon-web-wifi-config/luasrc/lib/gluon/config-mode/model/admin/wifi-config.lua
index 0e89ab2b..5119b6fc 100644
--- a/package/gluon-web-wifi-config/luasrc/lib/gluon/config-mode/model/admin/wifi-config.lua
+++ b/package/gluon-web-wifi-config/luasrc/lib/gluon/config-mode/model/admin/wifi-config.lua
@@ -128,7 +128,7 @@ uci:foreach('wireless', 'wifi-device', function(config)
 		local mode = p:option(ListValue, radio .. '_p2pmode', translate("P2P Mode"), translate("Master=AP Slave=Station"))
 		mode.default = uci:get('wireless', name6, 'mode') or 'ap'
 		mode:value('ap', translate('Master'))
-		mode:value('station', translate('Slave'))
+		mode:value('sta', translate('Slave'))
 		mode:depends(vif, true)
 		function mode:write(data)
 			uci:set('wireless', name6, 'mode', data)