Join/part misc fixes