Fix some listener api issues