additional android fixes