Changes to get app working on Heroku