Lots of nitpicks to Heroku content