Correct a few bug in the combo boxes