Fix auto-generated channels