Fixing a couple of bugs relating to joining channels. Closes #215