Fixes for LINQ and comboboxes