Changes to allow deploying to Heroku