Fix some UPnP problems