Minor fixes to colorPicker control