Fix controls created by xaml issues (#341)