Again 2 small fixes for XAML Designer