Fix stuff on join.