Mem leak plug
Improved Combobox resource selector