Combo box fixes