Heroku / Android compliance tweaks