Android tutorial urgent fixes