Slight updates to the UDP handlers