Combobox fixed and other small corrections