join/leave fixes