Few changes from Xamarin Studio