Bug fixes to allow cross channels
More bug fixes