Further updates for heroku deployment