Fix coloring problems