More colour picker fixes