More android fixes.