Minor listener fixes