Changes to work on Heroku