Changes to enable running on Heroku.