[todoxlf] XAML fixes