More work to react to service unregistrations