Color picker fixes