Small xaml fixes from my branch