Bonjour fixes

socket organization junk