more listener fixes