Small changes to UDP lifecycle.