More Heroku fixes