Android map click fixes