Did some Android modifications