Changes to allow for deployment on heroku