More changes for heroku's benefit.