FIx leaky listeners

This is for #9418