Bug fixes to ItemsSource binding