startup + upnp fixes