Small UDP changes