Code changes for xamarin demo apps