some android fixes