More changes to AvahiDiscoveryAgent