Fixes to coloring