Updates in keeping with Xamarin 5.1