Fix color problems