Fixed some concurrency local listener bugs