Fix joining participant issues #295