Fix Channel segfault
Fix Server segfault