minor android fixes