Fixes for color change