Color comment fixes