Try fix android bugs