Small Bug Fixes for Compatability

Some small things were tweaked to ensure compatability between comfort
components and the new color zone based on EP Result component.