Minor fixes for new color picker