UPNP fixes