Fix some ChannelName Late Resolution

Polishing