More android fixes