Fix bugs with latest xamarin forms package