A few fixes for the XAML Designer.

A few small fixes for the XAML Designer