Add some TODOs for correctness in ChannelMonitor