Yet more fixes to Bonjour teardown