Further updates for heroku