Making compatible with Heroku again, as well