fix some things with channel joining
Merge branch 'master' into c
update generated_c