Changes for heroku deployment