Work on AutoComboBox fixes