Fixed old XAML to build w new code