Cleaned up sending of discovery packages. Should work now as expected.