Various fixes to color manager