ComboList fixes