Fixed channel creation & update