fix android bugs