hopefully final Heroku fixes