Two updates to prevent browser from hanging