Fixing bugs found during Dallas XAML