Zeroconf fix - work in progress

For comments