Earlier fixes broke Guide/EPG UI