fix net/avahi and many others subsequently