Gaf 3 android fixes