So many Heroku fixes