Fixes on create channel
Fixes for channel creation
Small refactoring