More changes for Heroku