Minor fixes for Xamarin