Manage tracking of wrappers, bugfixes, factorize
fixe mute event tracking