A few Fixes for XAML Designer