More tweaking for Heroku.