Fix the setting of channel addresses