More ComboBox changes