fixed some late joiner issues