Changes required for Heroku