Better handling of deactivation/reactivation of links and events