Fix some UDP issues