fixed some channel issues