Even more Heroku fixes