Changes from xamarin studio