More changes for heroku