ios and android fixes