Fix issues with dev merge

- Add the decoder set back on the channel
- Undo the TcpInput ok check consolidation so he header is properly cleared