Various improvements to the join listener.