Fix combo boxes