Missed android fixes