Fixing android bugs