Fixes for channel guide