Fix handle handling
move demo channel creating