Changes for latest Heroku