Clear up color issues