more Heroku fixes