Actually fixed channel defines
Merged stuff