Fix ComboBox support.