Android quickstart fixes