Bug fixes for missing channel elements