Android cleanup fixes