Fixing some more issues around coloring