Protocol and channel fixes