Added fixes to join channel.