changes for heroku 6