JOIN/QUIT fixes