Bug fixes for channeling.
Refactoring: Extracting methods to separate transactions.