Changes required for heroku deployment