Android small changes