Couple of color fixes