A few listener fixes.