Minor tweaks for coloring