Fix color issues