Fix some native/upnp conflicts