Soem android fixes