More Android adaptations