Fix references in listeners.