Fixed uPnP issues