Bug fixes for color changing